diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 2e0ea4410b..1b85194e24 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -876,8 +876,8 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", "tracing-subscriber", @@ -937,13 +937,13 @@ dependencies = [ "lib-infra", "lib-ot", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project", "protobuf", "serde", "serde_json", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", "unicode-segmentation", @@ -965,11 +965,11 @@ dependencies = [ "flowy-derive", "flowy-error", "flowy-grid", - "flowy-grid-data-model", "flowy-revision", "flowy-sync", "flowy-test", "futures", + "grid-rev-model", "indexmap", "lazy_static", "lib-dispatch", @@ -984,28 +984,13 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", "url", ] -[[package]] -name = "flowy-grid-data-model" -version = "0.1.0" -dependencies = [ - "bytes", - "flowy-error-code", - "indexmap", - "lib-infra", - "nanoid", - "serde", - "serde_json", - "serde_repr", - "tracing", -] - [[package]] name = "flowy-net" version = "0.1.0" @@ -1037,8 +1022,8 @@ dependencies = [ "serde", "serde-aux", "serde_json", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", ] @@ -1057,11 +1042,11 @@ dependencies = [ "lib-infra", "lib-ws", "nanoid", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde", "serde_json", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", ] @@ -1078,13 +1063,13 @@ dependencies = [ "flowy-document", "flowy-folder", "flowy-grid", - "flowy-grid-data-model", "flowy-net", "flowy-revision", "flowy-sync", "flowy-user", "futures-core", "futures-util", + "grid-rev-model", "lib-dispatch", "lib-infra", "lib-log", @@ -1107,19 +1092,19 @@ dependencies = [ "dashmap", "dissimilar", "flowy-derive", - "flowy-grid-data-model", "folder-rev-model", "futures", + "grid-rev-model", "lib-infra", "lib-ot", "log", "md5", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "protobuf", "serde", "serde_json", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", "url", @@ -1188,8 +1173,8 @@ dependencies = [ "serde", "serde_json", "serial_test", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tracing", "unicode-segmentation", @@ -1212,8 +1197,8 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "strum 0.24.1", - "strum_macros 0.24.3", + "strum", + "strum_macros", ] [[package]] @@ -1411,6 +1396,19 @@ dependencies = [ "walkdir", ] +[[package]] +name = "grid-rev-model" +version = "0.1.0" +dependencies = [ + "bytes", + "flowy-error-code", + "indexmap", + "nanoid", + "serde", + "serde_json", + "serde_repr", +] + [[package]] name = "h2" version = "0.3.10" @@ -1451,12 +1449,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - [[package]] name = "hermit-abi" version = "0.1.19" @@ -1781,8 +1773,8 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "thiserror", "tokio", "tracing", @@ -1821,8 +1813,8 @@ dependencies = [ "paste", "pin-project", "protobuf", - "strum 0.21.0", - "strum_macros 0.21.1", + "strum", + "strum_macros", "tokio", "tokio-tungstenite", "tracing", @@ -3110,37 +3102,18 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - [[package]] name = "strum_macros" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", "syn", ] -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - [[package]] name = "syn" version = "1.0.85" diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml index 4abd868014..2342cad695 100644 --- a/frontend/rust-lib/flowy-folder/Cargo.toml +++ b/frontend/rust-lib/flowy-folder/Cargo.toml @@ -19,7 +19,7 @@ dart-notify = { path = "../dart-notify" } lib-dispatch = { path = "../lib-dispatch" } flowy-revision = { path = "../flowy-revision" } -parking_lot = "0.11" +parking_lot = "0.12.1" protobuf = {version = "2.18.0"} log = "0.4.14" diesel = {version = "1.4.8", features = ["sqlite"]} diff --git a/frontend/rust-lib/flowy-grid/Cargo.toml b/frontend/rust-lib/flowy-grid/Cargo.toml index b52bb4582d..93baf58eaa 100644 --- a/frontend/rust-lib/flowy-grid/Cargo.toml +++ b/frontend/rust-lib/flowy-grid/Cargo.toml @@ -13,7 +13,7 @@ flowy-error = { path = "../flowy-error", features = ["db"]} flowy-derive = { path = "../../../shared-lib/flowy-derive" } lib-ot = { path = "../../../shared-lib/lib-ot" } lib-infra = { path = "../../../shared-lib/lib-infra" } -flowy-grid-data-model = { path = "../../../shared-lib/flowy-grid-data-model" } +grid-rev-model = { path = "../../../shared-lib/grid-rev-model" } flowy-sync = { path = "../../../shared-lib/flowy-sync" } flowy-database = { path = "../flowy-database" } diff --git a/frontend/rust-lib/flowy-grid/src/entities/block_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/block_entities.rs index 6e271a0fb2..6198ab8960 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/block_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/block_entities.rs @@ -1,7 +1,7 @@ +use crate::entities::parser::NotEmptyStr; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::RowRevision; +use grid_rev_model::RowRevision; use std::sync::Arc; /// [BlockPB] contains list of row ids. The rows here does not contain any data, just the id diff --git a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs index 48886f1918..3e1981eb7f 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs @@ -1,8 +1,8 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::FieldType; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::{CellRevision, RowChangeset}; +use grid_rev_model::{CellRevision, RowChangeset}; use std::collections::HashMap; #[derive(ProtoBuf, Default)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs index 719a99990c..8469138110 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs @@ -1,10 +1,10 @@ use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::{FieldRevision, FieldTypeRevision}; +use grid_rev_model::{FieldRevision, FieldTypeRevision}; use serde_repr::*; use std::sync::Arc; +use crate::entities::parser::NotEmptyStr; use strum_macros::{Display, EnumCount as EnumCountMacro, EnumIter, EnumString}; /// [FieldPB] defines a Field's attributes. Such as the name, field_type, and width. etc. diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/checkbox_filter.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/checkbox_filter.rs index 45a64af245..a88451bb13 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/checkbox_filter.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/checkbox_filter.rs @@ -1,6 +1,6 @@ use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::revision::FilterConfigurationRevision; +use grid_rev_model::FilterConfigurationRevision; use std::sync::Arc; #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/date_filter.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/date_filter.rs index 72be45a655..db6fc55c0e 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/date_filter.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/date_filter.rs @@ -1,8 +1,8 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::FieldType; use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::FilterConfigurationRevision; +use grid_rev_model::FilterConfigurationRevision; use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/number_filter.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/number_filter.rs index 68c7474b8f..628d6d38d4 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/number_filter.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/number_filter.rs @@ -1,6 +1,6 @@ use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::revision::FilterConfigurationRevision; +use grid_rev_model::FilterConfigurationRevision; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/select_option_filter.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/select_option_filter.rs index 47e07c0b73..2ef40c687e 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/select_option_filter.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/select_option_filter.rs @@ -1,7 +1,7 @@ use crate::services::field::SelectOptionIds; use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::revision::FilterConfigurationRevision; +use grid_rev_model::FilterConfigurationRevision; use std::sync::Arc; #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/text_filter.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/text_filter.rs index 802941516d..31e5318cac 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/text_filter.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/text_filter.rs @@ -1,6 +1,6 @@ use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::revision::FilterConfigurationRevision; +use grid_rev_model::FilterConfigurationRevision; use std::sync::Arc; #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs index c6737e8e76..3f0d5b7125 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/filter_entities/util.rs @@ -1,11 +1,11 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{ CheckboxCondition, DateFilterCondition, FieldType, NumberFilterCondition, SelectOptionCondition, TextFilterCondition, }; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::{FieldRevision, FieldTypeRevision, FilterConfigurationRevision}; +use grid_rev_model::{FieldRevision, FieldTypeRevision, FilterConfigurationRevision}; use std::convert::TryInto; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/entities/grid_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/grid_entities.rs index c012376f55..f5af76b331 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/grid_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/grid_entities.rs @@ -1,7 +1,7 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{BlockPB, FieldIdPB}; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; /// [GridPB] describes how many fields and blocks the grid has #[derive(Debug, Clone, Default, ProtoBuf)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/group_entities/configuration.rs b/frontend/rust-lib/flowy-grid/src/entities/group_entities/configuration.rs index 19f5b27a9b..c3b08af328 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/group_entities/configuration.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/group_entities/configuration.rs @@ -1,5 +1,5 @@ use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; -use flowy_grid_data_model::revision::{GroupRevision, SelectOptionGroupConfigurationRevision}; +use grid_rev_model::{GroupRevision, SelectOptionGroupConfigurationRevision}; #[derive(Eq, PartialEq, ProtoBuf, Debug, Default, Clone)] pub struct UrlGroupConfigurationPB { diff --git a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs index d2c6eb0efb..ea2639ea05 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group.rs @@ -1,9 +1,9 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{CreateRowParams, FieldType, GridLayout, RowPB}; use crate::services::group::Group; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::{FieldTypeRevision, GroupConfigurationRevision}; +use grid_rev_model::{FieldTypeRevision, GroupConfigurationRevision}; use std::convert::TryInto; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group_changeset.rs b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group_changeset.rs index b6c9aafaff..c9aa176567 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/group_entities/group_changeset.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/group_entities/group_changeset.rs @@ -1,7 +1,7 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{GroupPB, InsertedRowPB, RowPB}; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; use std::fmt::Formatter; #[derive(Debug, Default, ProtoBuf)] diff --git a/frontend/rust-lib/flowy-grid/src/entities/mod.rs b/frontend/rust-lib/flowy-grid/src/entities/mod.rs index eb11d982a4..2246b3d41c 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/mod.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/mod.rs @@ -4,6 +4,7 @@ mod field_entities; mod filter_entities; mod grid_entities; mod group_entities; +pub mod parser; mod row_entities; mod setting_entities; diff --git a/shared-lib/flowy-grid-data-model/src/parser/str_parser.rs b/frontend/rust-lib/flowy-grid/src/entities/parser.rs similarity index 100% rename from shared-lib/flowy-grid-data-model/src/parser/str_parser.rs rename to frontend/rust-lib/flowy-grid/src/entities/parser.rs diff --git a/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs index 398351371c..af6a9a54f5 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs @@ -1,7 +1,7 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::GridLayout; use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; #[derive(Debug, Default, Clone, ProtoBuf)] pub struct RowIdPB { diff --git a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs index bbf5af831f..fc89402ae5 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/setting_entities.rs @@ -1,3 +1,4 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{ DeleteFilterParams, DeleteFilterPayloadPB, DeleteGroupParams, DeleteGroupPayloadPB, InsertFilterParams, InsertFilterPayloadPB, InsertGroupParams, InsertGroupPayloadPB, RepeatedGridFilterConfigurationPB, @@ -5,8 +6,7 @@ use crate::entities::{ }; use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::ErrorCode; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::LayoutRevision; +use grid_rev_model::LayoutRevision; use std::convert::TryInto; use strum::IntoEnumIterator; use strum_macros::EnumIter; diff --git a/frontend/rust-lib/flowy-grid/src/event_handler.rs b/frontend/rust-lib/flowy-grid/src/event_handler.rs index b312069ead..aeab802f83 100644 --- a/frontend/rust-lib/flowy-grid/src/event_handler.rs +++ b/frontend/rust-lib/flowy-grid/src/event_handler.rs @@ -9,7 +9,7 @@ use crate::services::field::{ }; use crate::services::row::make_row_from_row_rev; use flowy_error::{ErrorCode, FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::FieldRevision; +use grid_rev_model::FieldRevision; use lib_dispatch::prelude::{data_result, AppData, Data, DataResult}; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/manager.rs b/frontend/rust-lib/flowy-grid/src/manager.rs index 013b69510f..636d0d71aa 100644 --- a/frontend/rust-lib/flowy-grid/src/manager.rs +++ b/frontend/rust-lib/flowy-grid/src/manager.rs @@ -12,13 +12,13 @@ use bytes::Bytes; use flowy_database::ConnectionPool; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{BuildGridContext, GridRevision, GridViewRevision}; use flowy_revision::{ RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration, RevisionWebSocket, SQLiteRevisionSnapshotPersistence, }; use flowy_sync::client_grid::{make_grid_block_operations, make_grid_operations, make_grid_view_operations}; use flowy_sync::entities::revision::Revision; +use grid_rev_model::{BuildGridContext, GridRevision, GridViewRevision}; use lib_infra::ref_map::{RefCountHashMap, RefCountValue}; use crate::services::block_manager::make_grid_block_rev_manager; diff --git a/frontend/rust-lib/flowy-grid/src/services/block_editor.rs b/frontend/rust-lib/flowy-grid/src/services/block_editor.rs index 9ee6278bd6..f937826943 100644 --- a/frontend/rust-lib/flowy-grid/src/services/block_editor.rs +++ b/frontend/rust-lib/flowy-grid/src/services/block_editor.rs @@ -1,13 +1,13 @@ use crate::entities::RowPB; use bytes::Bytes; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{CellRevision, GridBlockRevision, RowChangeset, RowRevision}; use flowy_revision::{ RevisionCloudService, RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer, }; use flowy_sync::client_grid::{GridBlockRevisionChangeset, GridBlockRevisionPad}; use flowy_sync::entities::revision::Revision; use flowy_sync::util::make_operations_from_revisions; +use grid_rev_model::{CellRevision, GridBlockRevision, RowChangeset, RowRevision}; use lib_infra::future::FutureResult; use flowy_database::ConnectionPool; diff --git a/frontend/rust-lib/flowy-grid/src/services/block_manager.rs b/frontend/rust-lib/flowy-grid/src/services/block_manager.rs index 474e224fd5..40c9d774c7 100644 --- a/frontend/rust-lib/flowy-grid/src/services/block_manager.rs +++ b/frontend/rust-lib/flowy-grid/src/services/block_manager.rs @@ -8,12 +8,10 @@ use crate::services::row::{block_from_row_orders, make_row_from_row_rev, GridBlo use dashmap::DashMap; use flowy_database::ConnectionPool; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{ - GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowChangeset, RowRevision, -}; use flowy_revision::{ RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration, SQLiteRevisionSnapshotPersistence, }; +use grid_rev_model::{GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowChangeset, RowRevision}; use std::borrow::Cow; use std::collections::HashMap; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/block_manager_trait_impl.rs b/frontend/rust-lib/flowy-grid/src/services/block_manager_trait_impl.rs index 6342ba0099..8ba1234d57 100644 --- a/frontend/rust-lib/flowy-grid/src/services/block_manager_trait_impl.rs +++ b/frontend/rust-lib/flowy-grid/src/services/block_manager_trait_impl.rs @@ -1,7 +1,7 @@ use crate::services::block_manager::GridBlockManager; use crate::services::grid_view_manager::GridViewRowDelegate; -use flowy_grid_data_model::revision::RowRevision; +use grid_rev_model::RowRevision; use lib_infra::future::{wrap_future, AFFuture}; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/cell/any_cell_data.rs b/frontend/rust-lib/flowy-grid/src/services/cell/any_cell_data.rs index 1f64ca9ebb..f2832126b1 100644 --- a/frontend/rust-lib/flowy-grid/src/services/cell/any_cell_data.rs +++ b/frontend/rust-lib/flowy-grid/src/services/cell/any_cell_data.rs @@ -2,7 +2,7 @@ use crate::entities::FieldType; use crate::services::cell::{CellData, FromCellString}; use bytes::Bytes; use flowy_error::{internal_error, FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::CellRevision; +use grid_rev_model::CellRevision; use serde::{Deserialize, Serialize}; use std::str::FromStr; diff --git a/frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs b/frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs index 95c9c2f5bb..d638afce2f 100644 --- a/frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs +++ b/frontend/rust-lib/flowy-grid/src/services/cell/cell_operation.rs @@ -4,7 +4,7 @@ use crate::services::field::*; use std::fmt::Debug; use flowy_error::{ErrorCode, FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{CellRevision, FieldRevision, FieldTypeRevision}; +use grid_rev_model::{CellRevision, FieldRevision, FieldTypeRevision}; /// This trait is used when doing filter/search on the grid. pub trait CellFilterOperation { diff --git a/frontend/rust-lib/flowy-grid/src/services/field/field_builder.rs b/frontend/rust-lib/flowy-grid/src/services/field/field_builder.rs index 772371d561..5f232d1232 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/field_builder.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/field_builder.rs @@ -2,7 +2,7 @@ use crate::entities::{FieldPB, FieldType}; use crate::services::field::{default_type_option_builder_from_type, TypeOptionBuilder}; -use flowy_grid_data_model::revision::FieldRevision; +use grid_rev_model::FieldRevision; use indexmap::IndexMap; pub struct FieldBuilder { diff --git a/frontend/rust-lib/flowy-grid/src/services/field/field_operation.rs b/frontend/rust-lib/flowy-grid/src/services/field/field_operation.rs index e74712d821..3c358af6f6 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/field_operation.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/field_operation.rs @@ -1,7 +1,7 @@ use crate::services::field::{MultiSelectTypeOptionPB, SingleSelectTypeOptionPB}; use crate::services::grid_editor::GridRevisionEditor; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{TypeOptionDataDeserializer, TypeOptionDataSerializer}; +use grid_rev_model::{TypeOptionDataDeserializer, TypeOptionDataSerializer}; use std::sync::Arc; pub async fn edit_field_type_option( diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_option_builder.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_option_builder.rs index c2b2c549fa..dfedde49aa 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_option_builder.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_option_builder.rs @@ -1,7 +1,7 @@ use crate::entities::FieldType; use crate::services::field::type_options::*; use bytes::Bytes; -use flowy_grid_data_model::revision::TypeOptionDataSerializer; +use grid_rev_model::TypeOptionDataSerializer; pub trait TypeOptionBuilder { /// Returns the type of the type-option data diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_tests.rs index 838e341666..9512d5d229 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_tests.rs @@ -4,7 +4,7 @@ mod tests { use crate::services::cell::CellDataOperation; use crate::services::field::type_options::checkbox_type_option::*; use crate::services::field::FieldBuilder; - use flowy_grid_data_model::revision::FieldRevision; + use grid_rev_model::FieldRevision; #[test] fn checkout_box_description_test() { diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_type_option.rs index 399dffbb3a..da1fcda1a7 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/checkbox_type_option/checkbox_type_option.rs @@ -5,9 +5,7 @@ use crate::services::field::{BoxTypeOptionBuilder, CheckboxCellData, TypeOptionB use bytes::Bytes; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use serde::{Deserialize, Serialize}; use std::str::FromStr; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs index 2e08b91d1c..f118fe833f 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs @@ -4,7 +4,7 @@ mod tests { use crate::services::cell::CellDataOperation; use crate::services::field::*; // use crate::services::field::{DateCellChangeset, DateCellData, DateFormat, DateTypeOptionPB, TimeFormat}; - use flowy_grid_data_model::revision::FieldRevision; + use grid_rev_model::FieldRevision; use strum::IntoEnumIterator; #[test] diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs index 6a468b92f9..9f4418aa69 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs @@ -9,9 +9,7 @@ use chrono::format::strftime::StrftimeItems; use chrono::{NaiveDateTime, Timelike}; use flowy_derive::ProtoBuf; use flowy_error::{ErrorCode, FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use serde::{Deserialize, Serialize}; // Date diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_tests.rs index ebef1f0cfd..35ab1cce63 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_tests.rs @@ -4,7 +4,7 @@ mod tests { use crate::services::cell::CellDataOperation; use crate::services::field::FieldBuilder; use crate::services::field::{strip_currency_symbol, NumberFormat, NumberTypeOptionPB}; - use flowy_grid_data_model::revision::FieldRevision; + use grid_rev_model::FieldRevision; use strum::IntoEnumIterator; /// Testing when the input is not a number. diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs index 68cb6a1f2e..d36f1019e6 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs @@ -6,9 +6,7 @@ use crate::services::field::{BoxTypeOptionBuilder, NumberCellData, TypeOptionBui use bytes::Bytes; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use rust_decimal::Decimal; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/multi_select_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/multi_select_type_option.rs index a7a2e52732..d740ea7187 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/multi_select_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/multi_select_type_option.rs @@ -10,9 +10,7 @@ use crate::services::field::{ use bytes::Bytes; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use serde::{Deserialize, Serialize}; // Multiple select diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs index 7d6ec218b0..afc4a9c29e 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_type_option.rs @@ -1,3 +1,4 @@ +use crate::entities::parser::NotEmptyStr; use crate::entities::{CellChangesetPB, FieldType, GridCellIdPB, GridCellIdParams}; use crate::services::cell::{ CellBytes, CellBytesParser, CellData, CellDataIsEmpty, CellDisplayable, FromCellChangeset, FromCellString, @@ -7,8 +8,7 @@ use crate::services::field::{MultiSelectTypeOptionPB, SingleSelectTypeOptionPB}; use bytes::Bytes; use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error::{internal_error, ErrorCode, FlowyResult}; -use flowy_grid_data_model::parser::NotEmptyStr; -use flowy_grid_data_model::revision::{FieldRevision, TypeOptionDataSerializer}; +use grid_rev_model::{FieldRevision, TypeOptionDataSerializer}; use nanoid::nanoid; use serde::{Deserialize, Serialize}; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/single_select_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/single_select_type_option.rs index eb164a42ef..7aa1431b20 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/single_select_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/single_select_type_option.rs @@ -9,9 +9,7 @@ use crate::services::field::{ use bytes::Bytes; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use serde::{Deserialize, Serialize}; // Single select diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/type_option_transform.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/type_option_transform.rs index b829fa148b..cc4dec239b 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/type_option_transform.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/type_option_transform.rs @@ -4,7 +4,7 @@ use crate::services::field::{ SelectOptionColorPB, SelectOptionIds, SelectOptionPB, SelectTypeOptionSharedAction, CHECK, UNCHECK, }; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::FieldRevision; +use grid_rev_model::FieldRevision; /// Handles how to transform the cell data when switching between different field types pub struct SelectOptionTypeOptionTransformer(); diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option/text_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option/text_type_option.rs index 79bd48a2b0..798d6bce05 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option/text_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/text_type_option/text_type_option.rs @@ -8,9 +8,7 @@ use crate::services::field::{BoxTypeOptionBuilder, TypeOptionBuilder}; use bytes::Bytes; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use serde::{Deserialize, Serialize}; #[derive(Default)] diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_tests.rs index 97b8275287..b66badcf5b 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_tests.rs @@ -4,7 +4,7 @@ mod tests { use crate::services::cell::{CellData, CellDataOperation}; use crate::services::field::{FieldBuilder, URLCellDataParser}; use crate::services::field::{URLCellDataPB, URLTypeOptionPB}; - use flowy_grid_data_model::revision::FieldRevision; + use grid_rev_model::FieldRevision; /// The expected_str will equal to the input string, but the expected_url will be empty if there's no /// http url in the input string. diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_type_option.rs index 760c480a05..f3a5b6cb31 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_type_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/url_type_option/url_type_option.rs @@ -6,9 +6,7 @@ use bytes::Bytes; use fancy_regex::Regex; use flowy_derive::ProtoBuf; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer, -}; +use grid_rev_model::{CellRevision, FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer}; use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/util/cell_data_util.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/util/cell_data_util.rs index 549f502bb0..83c30722a8 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/util/cell_data_util.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/util/cell_data_util.rs @@ -1,5 +1,5 @@ use crate::services::cell::AnyCellData; -use flowy_grid_data_model::revision::CellRevision; +use grid_rev_model::CellRevision; use std::str::FromStr; pub fn get_cell_data(cell_rev: &CellRevision) -> String { diff --git a/frontend/rust-lib/flowy-grid/src/services/filter/filter_cache.rs b/frontend/rust-lib/flowy-grid/src/services/filter/filter_cache.rs index cad2998a5f..2dec371ade 100644 --- a/frontend/rust-lib/flowy-grid/src/services/filter/filter_cache.rs +++ b/frontend/rust-lib/flowy-grid/src/services/filter/filter_cache.rs @@ -3,8 +3,8 @@ use crate::entities::{ SelectOptionFilterConfigurationPB, TextFilterConfigurationPB, }; use dashmap::DashMap; -use flowy_grid_data_model::revision::{FieldRevision, FilterConfigurationRevision, RowRevision}; use flowy_sync::client_grid::GridRevisionPad; +use grid_rev_model::{FieldRevision, FilterConfigurationRevision, RowRevision}; use std::collections::HashMap; use std::sync::Arc; use tokio::sync::RwLock; diff --git a/frontend/rust-lib/flowy-grid/src/services/filter/filter_service.rs b/frontend/rust-lib/flowy-grid/src/services/filter/filter_service.rs index 173dc8ffea..8c1bf9a451 100644 --- a/frontend/rust-lib/flowy-grid/src/services/filter/filter_service.rs +++ b/frontend/rust-lib/flowy-grid/src/services/filter/filter_service.rs @@ -18,8 +18,8 @@ use crate::services::grid_editor_task::GridServiceTaskScheduler; use crate::services::row::GridBlockSnapshot; use crate::services::tasks::{FilterTaskContext, Task, TaskContent}; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{CellRevision, FieldId, FieldRevision, RowRevision}; use flowy_sync::client_grid::GridRevisionPad; +use grid_rev_model::{CellRevision, FieldId, FieldRevision, RowRevision}; use rayon::prelude::*; use std::collections::HashMap; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs index d88c7ec0e4..bfe02ff835 100644 --- a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs +++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs @@ -15,7 +15,6 @@ use crate::services::persistence::block_index::BlockIndexCache; use crate::services::row::{make_grid_blocks, make_rows_from_row_revs, GridBlockSnapshot, RowRevisionBuilder}; use bytes::Bytes; use flowy_error::{ErrorCode, FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::*; use flowy_revision::{ RevisionCloudService, RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer, }; @@ -23,6 +22,7 @@ use flowy_sync::client_grid::{GridRevisionChangeset, GridRevisionPad, JsonDeseri use flowy_sync::entities::revision::Revision; use flowy_sync::errors::{CollaborateError, CollaborateResult}; use flowy_sync::util::make_operations_from_revisions; +use grid_rev_model::*; use lib_infra::future::{wrap_future, FutureResult}; use flowy_database::ConnectionPool; diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_editor_trait_impl.rs b/frontend/rust-lib/flowy-grid/src/services/grid_editor_trait_impl.rs index 43bc74bf12..0c2a1ae41a 100644 --- a/frontend/rust-lib/flowy-grid/src/services/grid_editor_trait_impl.rs +++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor_trait_impl.rs @@ -1,6 +1,6 @@ use crate::services::grid_view_manager::GridViewFieldDelegate; -use flowy_grid_data_model::revision::FieldRevision; use flowy_sync::client_grid::GridRevisionPad; +use grid_rev_model::FieldRevision; use lib_infra::future::{wrap_future, AFFuture}; use std::sync::Arc; use tokio::sync::RwLock; diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs index 4e0f707708..2fc8b3351f 100644 --- a/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs +++ b/frontend/rust-lib/flowy-grid/src/services/grid_view_editor.rs @@ -14,16 +14,16 @@ use crate::services::group::{ use bytes::Bytes; use flowy_database::ConnectionPool; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ - gen_grid_filter_id, FieldRevision, FieldTypeRevision, FilterConfigurationRevision, GroupConfigurationRevision, - RowChangeset, RowRevision, -}; use flowy_revision::{ RevisionCloudService, RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionObjectSerializer, }; use flowy_sync::client_grid::{GridViewRevisionChangeset, GridViewRevisionPad}; use flowy_sync::entities::revision::Revision; use flowy_sync::util::make_operations_from_revisions; +use grid_rev_model::{ + gen_grid_filter_id, FieldRevision, FieldTypeRevision, FilterConfigurationRevision, GroupConfigurationRevision, + RowChangeset, RowRevision, +}; use lib_infra::future::{wrap_future, AFFuture, FutureResult}; use lib_ot::core::EmptyAttributes; use std::future::Future; diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs b/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs index b902d2d25b..4cd0dd22c7 100644 --- a/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs +++ b/frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs @@ -10,10 +10,10 @@ use crate::services::persistence::rev_sqlite::SQLiteGridViewRevisionPersistence; use dashmap::DashMap; use flowy_database::ConnectionPool; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{FieldRevision, RowChangeset, RowRevision}; use flowy_revision::{ RevisionManager, RevisionPersistence, RevisionPersistenceConfiguration, SQLiteRevisionSnapshotPersistence, }; +use grid_rev_model::{FieldRevision, RowChangeset, RowRevision}; use lib_infra::future::AFFuture; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/group/action.rs b/frontend/rust-lib/flowy-grid/src/services/group/action.rs index 27f0a3d90c..394899e2b2 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/action.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/action.rs @@ -3,7 +3,7 @@ use crate::services::cell::CellDataIsEmpty; use crate::services::group::controller::MoveGroupRowContext; use crate::services::group::Group; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{CellRevision, FieldRevision, RowRevision}; +use grid_rev_model::{CellRevision, FieldRevision, RowRevision}; use std::sync::Arc; /// Using polymorphism to provides the customs action for different group controller. diff --git a/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs b/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs index ab554f195e..130f7cc301 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/configuration.rs @@ -1,7 +1,7 @@ use crate::entities::{GroupPB, GroupViewChangesetPB}; use crate::services::group::{default_group_configuration, GeneratedGroupContext, Group}; use flowy_error::{FlowyError, FlowyResult}; -use flowy_grid_data_model::revision::{ +use grid_rev_model::{ FieldRevision, FieldTypeRevision, GroupConfigurationContentSerde, GroupConfigurationRevision, GroupRevision, }; use indexmap::IndexMap; diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller.rs index 899193b5d4..71114b9326 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller.rs @@ -4,7 +4,7 @@ use crate::services::group::action::{GroupControllerCustomActions, GroupControll use crate::services::group::configuration::GroupContext; use crate::services::group::entities::Group; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{ +use grid_rev_model::{ FieldRevision, GroupConfigurationContentSerde, GroupRevision, RowChangeset, RowRevision, TypeOptionDataDeserializer, }; use std::marker::PhantomData; diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/checkbox_controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/checkbox_controller.rs index 3187b216f4..0a6ff487fb 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/checkbox_controller.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/checkbox_controller.rs @@ -8,9 +8,7 @@ use crate::services::group::controller::{ use crate::services::cell::insert_checkbox_cell; use crate::services::group::{move_group_row, GeneratedGroupConfig, GeneratedGroupContext}; -use flowy_grid_data_model::revision::{ - CellRevision, CheckboxGroupConfigurationRevision, FieldRevision, GroupRevision, RowRevision, -}; +use grid_rev_model::{CellRevision, CheckboxGroupConfigurationRevision, FieldRevision, GroupRevision, RowRevision}; pub type CheckboxGroupController = GenericGroupController< CheckboxGroupConfigurationRevision, diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs index d262d625c1..a35b202021 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/default_controller.rs @@ -2,7 +2,7 @@ use crate::entities::{GroupChangesetPB, GroupViewChangesetPB, RowPB}; use crate::services::group::action::GroupControllerSharedActions; use crate::services::group::{Group, GroupController, MoveGroupRowContext}; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{FieldRevision, RowRevision}; +use grid_rev_model::{FieldRevision, RowRevision}; use std::sync::Arc; /// A [DefaultGroupController] is used to handle the group actions for the [FieldType] that doesn't diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/multi_select_controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/multi_select_controller.rs index 58bb4a23d0..193390ef25 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/multi_select_controller.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/multi_select_controller.rs @@ -9,7 +9,7 @@ use crate::services::group::controller::{ use crate::services::group::controller_impls::select_option_controller::util::*; use crate::services::group::{make_no_status_group, GeneratedGroupContext}; -use flowy_grid_data_model::revision::{FieldRevision, RowRevision, SelectOptionGroupConfigurationRevision}; +use grid_rev_model::{FieldRevision, RowRevision, SelectOptionGroupConfigurationRevision}; // MultiSelect pub type MultiSelectGroupController = GenericGroupController< diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/single_select_controller.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/single_select_controller.rs index 203e4f1675..fcae75d2b6 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/single_select_controller.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/single_select_controller.rs @@ -10,7 +10,7 @@ use crate::services::group::controller_impls::select_option_controller::util::*; use crate::services::group::entities::Group; use crate::services::group::{make_no_status_group, GeneratedGroupContext}; -use flowy_grid_data_model::revision::{FieldRevision, RowRevision, SelectOptionGroupConfigurationRevision}; +use grid_rev_model::{FieldRevision, RowRevision, SelectOptionGroupConfigurationRevision}; // SingleSelect pub type SingleSelectGroupController = GenericGroupController< diff --git a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/util.rs b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/util.rs index 29bbd8f0f9..fab7a57902 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/util.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/controller_impls/select_option_controller/util.rs @@ -4,9 +4,7 @@ use crate::services::field::{SelectOptionCellDataPB, SelectOptionPB, CHECK}; use crate::services::group::configuration::GroupContext; use crate::services::group::controller::MoveGroupRowContext; use crate::services::group::{GeneratedGroupConfig, Group}; -use flowy_grid_data_model::revision::{ - CellRevision, FieldRevision, GroupRevision, RowRevision, SelectOptionGroupConfigurationRevision, -}; +use grid_rev_model::{CellRevision, FieldRevision, GroupRevision, RowRevision, SelectOptionGroupConfigurationRevision}; pub type SelectOptionGroupContext = GroupContext; diff --git a/frontend/rust-lib/flowy-grid/src/services/group/group_util.rs b/frontend/rust-lib/flowy-grid/src/services/group/group_util.rs index c8116d6897..eb224ce493 100644 --- a/frontend/rust-lib/flowy-grid/src/services/group/group_util.rs +++ b/frontend/rust-lib/flowy-grid/src/services/group/group_util.rs @@ -6,7 +6,7 @@ use crate::services::group::{ MultiSelectGroupController, SelectOptionGroupContext, SingleSelectGroupController, }; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::{ +use grid_rev_model::{ CheckboxGroupConfigurationRevision, DateGroupConfigurationRevision, FieldRevision, GroupConfigurationRevision, GroupRevision, LayoutRevision, NumberGroupConfigurationRevision, RowRevision, SelectOptionGroupConfigurationRevision, TextGroupConfigurationRevision, UrlGroupConfigurationRevision, diff --git a/frontend/rust-lib/flowy-grid/src/services/persistence/migration.rs b/frontend/rust-lib/flowy-grid/src/services/persistence/migration.rs index 75e4e5d01a..ca8c68a185 100644 --- a/frontend/rust-lib/flowy-grid/src/services/persistence/migration.rs +++ b/frontend/rust-lib/flowy-grid/src/services/persistence/migration.rs @@ -3,11 +3,11 @@ use crate::services::persistence::GridDatabase; use bytes::Bytes; use flowy_database::kv::KV; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::GridRevision; use flowy_revision::reset::{RevisionResettable, RevisionStructReset}; use flowy_sync::client_grid::{make_grid_rev_json_str, GridOperationsBuilder, GridRevisionPad}; use flowy_sync::entities::revision::Revision; use flowy_sync::util::md5; +use grid_rev_model::GridRevision; use crate::services::persistence::rev_sqlite::SQLiteGridRevisionPersistence; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/row/row_builder.rs b/frontend/rust-lib/flowy-grid/src/services/row/row_builder.rs index a9bef408f1..ddf8c40675 100644 --- a/frontend/rust-lib/flowy-grid/src/services/row/row_builder.rs +++ b/frontend/rust-lib/flowy-grid/src/services/row/row_builder.rs @@ -3,7 +3,7 @@ use crate::services::cell::{ insert_url_cell, }; -use flowy_grid_data_model::revision::{gen_row_id, CellRevision, FieldRevision, RowRevision, DEFAULT_ROW_HEIGHT}; +use grid_rev_model::{gen_row_id, CellRevision, FieldRevision, RowRevision, DEFAULT_ROW_HEIGHT}; use indexmap::IndexMap; use std::collections::HashMap; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs b/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs index 1a0d0eaff6..22e9ded7d1 100644 --- a/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs +++ b/frontend/rust-lib/flowy-grid/src/services/row/row_loader.rs @@ -1,6 +1,6 @@ use crate::entities::{BlockPB, RepeatedBlockPB, RowPB}; use flowy_error::FlowyResult; -use flowy_grid_data_model::revision::RowRevision; +use grid_rev_model::RowRevision; use std::collections::HashMap; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-grid/src/util.rs b/frontend/rust-lib/flowy-grid/src/util.rs index 7f34774ad0..d7b8495531 100644 --- a/frontend/rust-lib/flowy-grid/src/util.rs +++ b/frontend/rust-lib/flowy-grid/src/util.rs @@ -1,8 +1,8 @@ use crate::entities::FieldType; use crate::services::field::*; use crate::services::row::RowRevisionBuilder; -use flowy_grid_data_model::revision::BuildGridContext; use flowy_sync::client_grid::GridBuilder; +use grid_rev_model::BuildGridContext; pub fn make_default_grid() -> BuildGridContext { let mut grid_builder = GridBuilder::new(); diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/block_test.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/block_test.rs index 6ded1f7060..e9aa368f7d 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/block_test.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/block_test.rs @@ -1,7 +1,7 @@ use crate::grid::block_test::script::GridRowTest; use crate::grid::block_test::script::RowScript::*; -use flowy_grid_data_model::revision::{GridBlockMetaRevision, GridBlockMetaRevisionChangeset}; +use grid_rev_model::{GridBlockMetaRevision, GridBlockMetaRevisionChangeset}; #[tokio::test] async fn grid_create_block() { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/row_test.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/row_test.rs index 72b3a288a1..db3d735f29 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/row_test.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/row_test.rs @@ -3,7 +3,7 @@ use crate::grid::block_test::script::{CreateRowScriptBuilder, GridRowTest}; use crate::grid::grid_editor::{COMPLETED, FACEBOOK, GOOGLE, PAUSED, TWITTER}; use flowy_grid::entities::FieldType; use flowy_grid::services::field::{SELECTION_IDS_SEPARATOR, UNCHECK}; -use flowy_grid_data_model::revision::RowChangeset; +use grid_rev_model::RowChangeset; #[tokio::test] async fn grid_create_row_count_test() { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs index df0c105e39..fc388e7d97 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs @@ -4,9 +4,7 @@ use crate::grid::grid_editor::GridEditorTest; use flowy_grid::entities::{CreateRowParams, FieldType, GridCellIdParams, GridLayout, RowPB}; use flowy_grid::services::field::*; -use flowy_grid_data_model::revision::{ - GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowChangeset, RowRevision, -}; +use grid_rev_model::{GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowChangeset, RowRevision}; use std::collections::HashMap; use std::sync::Arc; use strum::IntoEnumIterator; diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/util.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/util.rs index 03a3838afc..edf2973896 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/util.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/util.rs @@ -5,7 +5,7 @@ use flowy_grid::services::field::{ DateCellChangesetPB, MultiSelectTypeOptionPB, SelectOptionPB, SingleSelectTypeOptionPB, }; use flowy_grid::services::row::RowRevisionBuilder; -use flowy_grid_data_model::revision::{FieldRevision, RowRevision}; +use grid_rev_model::{FieldRevision, RowRevision}; use strum::EnumCount; diff --git a/frontend/rust-lib/flowy-grid/tests/grid/field_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/field_test/script.rs index d0652b0d01..c187549ff8 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/field_test/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/field_test/script.rs @@ -1,6 +1,6 @@ use crate::grid::grid_editor::GridEditorTest; use flowy_grid::entities::{CreateFieldParams, FieldChangesetParams}; -use flowy_grid_data_model::revision::FieldRevision; +use grid_rev_model::FieldRevision; pub enum FieldScript { CreateField { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/field_test/test.rs b/frontend/rust-lib/flowy-grid/tests/grid/field_test/test.rs index 5db21ecded..71de319c3a 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/field_test/test.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/field_test/test.rs @@ -4,7 +4,7 @@ use crate::grid::field_test::util::*; use flowy_grid::entities::FieldChangesetParams; use flowy_grid::services::field::selection_type_option::SelectOptionPB; use flowy_grid::services::field::SingleSelectTypeOptionPB; -use flowy_grid_data_model::revision::TypeOptionDataSerializer; +use grid_rev_model::TypeOptionDataSerializer; #[tokio::test] async fn grid_create_field() { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/field_test/util.rs b/frontend/rust-lib/flowy-grid/tests/grid/field_test/util.rs index c3d2e9f88f..527f7e7761 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/field_test/util.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/field_test/util.rs @@ -1,7 +1,7 @@ use flowy_grid::entities::*; use flowy_grid::services::field::selection_type_option::SelectOptionPB; use flowy_grid::services::field::*; -use flowy_grid_data_model::revision::*; +use grid_rev_model::*; pub fn create_text_field(grid_id: &str) -> (CreateFieldParams, FieldRevision) { let mut field_rev = FieldBuilder::new(RichTextTypeOptionBuilder::default()) diff --git a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs index 0eff7edaa4..371d1d76b2 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/script.rs @@ -5,7 +5,7 @@ use flowy_grid::entities::{InsertFilterParams, InsertFilterPayloadPB, DeleteFilterParams, GridLayout, GridSettingChangesetParams, GridSettingPB}; use flowy_grid::services::setting::GridSettingChangesetBuilder; -use flowy_grid_data_model::revision::{FieldRevision, FieldTypeRevision}; +use grid_rev_model::{FieldRevision, FieldTypeRevision}; use crate::grid::grid_editor::GridEditorTest; pub enum FilterScript { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs index 5868e16c2d..3893bc3d53 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/filter_test/text_filter_test.rs @@ -1,7 +1,7 @@ use crate::grid::filter_test::script::FilterScript::*; use crate::grid::filter_test::script::*; use flowy_grid::entities::{FieldType, InsertFilterPayloadPB, TextFilterCondition}; -use flowy_grid_data_model::revision::FieldRevision; +use grid_rev_model::FieldRevision; #[tokio::test] async fn grid_filter_create_test() { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/grid_editor.rs b/frontend/rust-lib/flowy-grid/tests/grid/grid_editor.rs index ccccea454d..6ff1205bbc 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/grid_editor.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/grid_editor.rs @@ -9,11 +9,11 @@ use flowy_grid::services::field::*; use flowy_grid::services::grid_editor::{GridRevisionEditor, GridRevisionSerde}; use flowy_grid::services::row::{CreateRowRevisionPayload, RowRevisionBuilder}; use flowy_grid::services::setting::GridSettingChangesetBuilder; -use flowy_grid_data_model::revision::*; use flowy_revision::REVISION_WRITE_INTERVAL_IN_MILLIS; use flowy_sync::client_grid::GridBuilder; use flowy_test::helper::ViewTest; use flowy_test::FlowySDKTest; +use grid_rev_model::*; use std::collections::HashMap; use std::sync::Arc; use std::time::Duration; diff --git a/frontend/rust-lib/flowy-grid/tests/grid/grid_test.rs b/frontend/rust-lib/flowy-grid/tests/grid/grid_test.rs index 42e4e860e0..61e3b8385d 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/grid_test.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/grid_test.rs @@ -6,7 +6,7 @@ use flowy_grid::services::field::{ SingleSelectTypeOption, SELECTION_IDS_SEPARATOR, }; use flowy_grid::services::row::{decode_cell_data_from_type_option_cell_data, CreateRowMetaBuilder}; -use flowy_grid_data_model::entities::{ +use grid_rev_model::entities::{ CellChangeset, FieldChangesetParams, FieldType, GridBlockInfoChangeset, GridBlockMetaSnapshot, RowMetaChangeset, TypeOptionDataFormat, }; diff --git a/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs index 2c3239370d..3e673889a4 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/group_test/script.rs @@ -6,7 +6,7 @@ use flowy_grid::services::cell::{delete_select_option_cell, insert_select_option use flowy_grid::services::field::{ edit_single_select_type_option, SelectOptionPB, SelectTypeOptionSharedAction, SingleSelectTypeOptionPB, }; -use flowy_grid_data_model::revision::{FieldRevision, RowChangeset}; +use grid_rev_model::{FieldRevision, RowChangeset}; use std::sync::Arc; pub enum GroupScript { diff --git a/frontend/rust-lib/flowy-grid/tests/grid/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/script.rs index eb65e2a7c8..f8bf90dac2 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/script.rs @@ -2,15 +2,15 @@ use bytes::Bytes; use flowy_grid::services::field::*; use flowy_grid::services::grid_meta_editor::{GridMetaEditor, GridPadBuilder}; use flowy_grid::services::row::CreateRowMetaPayload; -use flowy_grid_data_model::entities::{ - BuildGridContext, CellChangeset, Field, FieldChangesetParams, FieldMeta, FieldOrder, FieldType, - GridBlockInfoChangeset, GridBlockMetaSnapshot, InsertFieldParams, RowMeta, RowMetaChangeset, RowOrder, - TypeOptionDataFormat, -}; use flowy_revision::REVISION_WRITE_INTERVAL_IN_MILLIS; use flowy_sync::client_grid::GridBuilder; use flowy_test::helper::ViewTest; use flowy_test::FlowySDKTest; +use grid_rev_model::entities::{ + BuildGridContext, CellChangeset, Field, FieldChangesetParams, FieldMeta, FieldOrder, FieldType, + GridBlockInfoChangeset, GridBlockMetaSnapshot, InsertFieldParams, RowMeta, RowMetaChangeset, RowOrder, + TypeOptionDataFormat, +}; use std::collections::HashMap; use std::sync::Arc; use std::time::Duration; diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.toml index eea4480413..c9dc6784ae 100644 --- a/frontend/rust-lib/flowy-net/Cargo.toml +++ b/frontend/rust-lib/flowy-net/Cargo.toml @@ -21,7 +21,7 @@ lib-ws = { path = "../../../shared-lib/lib-ws" } bytes = { version = "1.0" } anyhow = "1.0" tokio = {version = "1", features = ["sync"]} -parking_lot = "0.11" +parking_lot = "0.12.1" strum = "0.21" strum_macros = "0.21" tracing = { version = "0.1", features = ["log"] } diff --git a/frontend/rust-lib/flowy-revision/Cargo.toml b/frontend/rust-lib/flowy-revision/Cargo.toml index 049bfdad45..7c53dc5ba4 100644 --- a/frontend/rust-lib/flowy-revision/Cargo.toml +++ b/frontend/rust-lib/flowy-revision/Cargo.toml @@ -26,7 +26,7 @@ nanoid = "0.4.0" flowy-revision = {path = "../flowy-revision", features = ["flowy_unit_test"]} serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } -parking_lot = "0.11" +parking_lot = "0.12.1" [features] flowy_unit_test = [] \ No newline at end of file diff --git a/frontend/rust-lib/flowy-sdk/Cargo.toml b/frontend/rust-lib/flowy-sdk/Cargo.toml index 7a1be98efa..b61d46a4a6 100644 --- a/frontend/rust-lib/flowy-sdk/Cargo.toml +++ b/frontend/rust-lib/flowy-sdk/Cargo.toml @@ -12,7 +12,7 @@ flowy-user = { path = "../flowy-user" } flowy-net = { path = "../flowy-net" } flowy-folder = { path = "../flowy-folder", default-features = false } flowy-grid = { path = "../flowy-grid", default-features = false } -flowy-grid-data-model = { path = "../../../shared-lib/flowy-grid-data-model" } +grid-rev-model = { path = "../../../shared-lib/grid-rev-model" } flowy-database = { path = "../flowy-database" } flowy-document = { path = "../flowy-document", default-features = false } flowy-revision = { path = "../flowy-revision" } @@ -23,7 +23,7 @@ futures-core = { version = "0.3", default-features = false } color-eyre = { version = "0.5", default-features = false } bytes = "1.0" tokio = { version = "1", features = ["rt"] } -parking_lot = "0.11" +parking_lot = "0.12.1" flowy-sync = { path = "../../../shared-lib/flowy-sync" } lib-ws = { path = "../../../shared-lib/lib-ws" } diff --git a/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs b/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs index 35def846a7..117cb50bd6 100644 --- a/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs +++ b/frontend/rust-lib/flowy-sdk/src/deps_resolve/folder_deps.rs @@ -12,7 +12,6 @@ use flowy_folder::{ use flowy_grid::entities::GridLayout; use flowy_grid::manager::{make_grid_view_data, GridManager}; use flowy_grid::util::{make_default_board, make_default_grid}; -use flowy_grid_data_model::revision::BuildGridContext; use flowy_net::ClientServerConfiguration; use flowy_net::{ http_server::folder::FolderHttpCloudService, local_server::LocalServer, ws::connection::FlowyWebSocketConnect, @@ -22,6 +21,7 @@ use flowy_sync::entities::revision::Revision; use flowy_sync::entities::ws_data::ClientRevisionWSData; use flowy_user::services::UserSession; use futures_core::future::BoxFuture; +use grid_rev_model::BuildGridContext; use lib_infra::future::{BoxResultFuture, FutureResult}; use lib_ws::{WSChannel, WSMessageReceiver, WebSocketRawMessage}; use std::collections::HashMap; diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml index 46490817ce..57f149b264 100644 --- a/frontend/rust-lib/flowy-user/Cargo.toml +++ b/frontend/rust-lib/flowy-user/Cargo.toml @@ -24,7 +24,7 @@ lazy_static = "1.4.0" diesel = {version = "1.4.8", features = ["sqlite"]} diesel_derives = {version = "1.4.1", features = ["sqlite"]} once_cell = "1.7.2" -parking_lot = "0.11" +parking_lot = "0.12.1" strum = "0.21" strum_macros = "0.21" tokio = { version = "1", features = ["rt"] } diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock index b3cc008e76..a8a8312749 100644 --- a/shared-lib/Cargo.lock +++ b/shared-lib/Cargo.lock @@ -403,21 +403,6 @@ dependencies = [ "protobuf", ] -[[package]] -name = "flowy-grid-data-model" -version = "0.1.0" -dependencies = [ - "bytes", - "flowy-error-code", - "indexmap", - "lib-infra", - "nanoid", - "serde", - "serde_json", - "serde_repr", - "tracing", -] - [[package]] name = "flowy-sync" version = "0.1.0" @@ -428,14 +413,14 @@ dependencies = [ "dashmap", "dissimilar", "flowy-derive", - "flowy-grid-data-model", "folder-rev-model", "futures", + "grid-rev-model", "lib-infra", "lib-ot", "log", "md5", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "protobuf", "serde", "serde_json", @@ -641,6 +626,20 @@ dependencies = [ "walkdir", ] +[[package]] +name = "grid-rev-model" +version = "0.1.0" +dependencies = [ + "bytes", + "flowy-error-code", + "indexmap", + "nanoid", + "serde", + "serde_json", + "serde_repr", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml index 7a1f7a8d50..51c38e87cb 100644 --- a/shared-lib/Cargo.toml +++ b/shared-lib/Cargo.toml @@ -8,7 +8,7 @@ members = [ "flowy-derive", "flowy-ast", "flowy-error-code", - "flowy-grid-data-model", + "grid-rev-model", ] [profile.dev] diff --git a/shared-lib/flowy-grid-data-model/src/lib.rs b/shared-lib/flowy-grid-data-model/src/lib.rs deleted file mode 100644 index c4306291e8..0000000000 --- a/shared-lib/flowy-grid-data-model/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod parser; -pub mod revision; diff --git a/shared-lib/flowy-grid-data-model/src/parser/mod.rs b/shared-lib/flowy-grid-data-model/src/parser/mod.rs deleted file mode 100644 index 8a9739e5b3..0000000000 --- a/shared-lib/flowy-grid-data-model/src/parser/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod str_parser; -pub use str_parser::*; diff --git a/shared-lib/flowy-grid-data-model/tests/serde_test.rs b/shared-lib/flowy-grid-data-model/tests/serde_test.rs deleted file mode 100644 index b544e10588..0000000000 --- a/shared-lib/flowy-grid-data-model/tests/serde_test.rs +++ /dev/null @@ -1,10 +0,0 @@ -use flowy_grid_data_model::revision::*; - -#[test] -fn grid_default_serde_test() { - let grid_id = "1".to_owned(); - let grid = GridRevision::new(&grid_id); - - let json = serde_json::to_string(&grid).unwrap(); - assert_eq!(json, r#"{"grid_id":"1","fields":[],"blocks":[]}"#) -} diff --git a/shared-lib/flowy-sync/Cargo.toml b/shared-lib/flowy-sync/Cargo.toml index 3ce908935b..dfb1ee6236 100644 --- a/shared-lib/flowy-sync/Cargo.toml +++ b/shared-lib/flowy-sync/Cargo.toml @@ -10,7 +10,7 @@ lib-ot = { path = "../lib-ot" } lib-infra = { path = "../lib-infra" } flowy-derive = { path = "../flowy-derive" } folder-rev-model = { path = "../folder-rev-model" } -flowy-grid-data-model = { path = "../flowy-grid-data-model" } +grid-rev-model = { path = "../grid-rev-model" } protobuf = {version = "2.18.0"} bytes = "1.0" log = "0.4.14" @@ -24,7 +24,7 @@ url = "2.2" strum = "0.21" strum_macros = "0.21" chrono = "0.4.19" -parking_lot = "0.11" +parking_lot = "0.12.1" dashmap = "5" futures = "0.3.15" async-stream = "0.3.2" diff --git a/shared-lib/flowy-sync/src/client_grid/block_revision_pad.rs b/shared-lib/flowy-sync/src/client_grid/block_revision_pad.rs index 5a95510f7f..74db99fc17 100644 --- a/shared-lib/flowy-sync/src/client_grid/block_revision_pad.rs +++ b/shared-lib/flowy-sync/src/client_grid/block_revision_pad.rs @@ -1,9 +1,7 @@ use crate::entities::revision::{RepeatedRevision, Revision}; use crate::errors::{CollaborateError, CollaborateResult}; use crate::util::{cal_diff, make_operations_from_revisions, md5}; -use flowy_grid_data_model::revision::{ - gen_block_id, gen_row_id, CellRevision, GridBlockRevision, RowChangeset, RowRevision, -}; +use grid_rev_model::{gen_block_id, gen_row_id, CellRevision, GridBlockRevision, RowChangeset, RowRevision}; use lib_ot::core::{DeltaBuilder, DeltaOperations, EmptyAttributes, OperationTransform}; use std::borrow::Cow; use std::collections::HashMap; @@ -281,7 +279,7 @@ impl std::default::Default for GridBlockRevisionPad { #[cfg(test)] mod tests { use crate::client_grid::{GridBlockOperations, GridBlockRevisionPad}; - use flowy_grid_data_model::revision::{RowChangeset, RowRevision}; + use grid_rev_model::{RowChangeset, RowRevision}; use std::borrow::Cow; diff --git a/shared-lib/flowy-sync/src/client_grid/grid_builder.rs b/shared-lib/flowy-sync/src/client_grid/grid_builder.rs index ad3f443505..31ac7dfa50 100644 --- a/shared-lib/flowy-sync/src/client_grid/grid_builder.rs +++ b/shared-lib/flowy-sync/src/client_grid/grid_builder.rs @@ -1,7 +1,5 @@ use crate::errors::{CollaborateError, CollaborateResult}; -use flowy_grid_data_model::revision::{ - BuildGridContext, FieldRevision, GridBlockMetaRevision, GridBlockRevision, RowRevision, -}; +use grid_rev_model::{BuildGridContext, FieldRevision, GridBlockMetaRevision, GridBlockRevision, RowRevision}; use std::sync::Arc; pub struct GridBuilder { diff --git a/shared-lib/flowy-sync/src/client_grid/grid_revision_pad.rs b/shared-lib/flowy-sync/src/client_grid/grid_revision_pad.rs index 2bcc1377c2..31ec7a71e9 100644 --- a/shared-lib/flowy-sync/src/client_grid/grid_revision_pad.rs +++ b/shared-lib/flowy-sync/src/client_grid/grid_revision_pad.rs @@ -2,7 +2,7 @@ use crate::entities::revision::{RepeatedRevision, Revision}; use crate::errors::{internal_error, CollaborateError, CollaborateResult}; use crate::util::{cal_diff, make_operations_from_revisions, md5}; -use flowy_grid_data_model::revision::{ +use grid_rev_model::{ gen_block_id, gen_grid_id, FieldRevision, FieldTypeRevision, GridBlockMetaRevision, GridBlockMetaRevisionChangeset, GridRevision, }; diff --git a/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs b/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs index 04dd82d8ea..8e40a00285 100644 --- a/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs +++ b/shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs @@ -1,7 +1,7 @@ use crate::entities::revision::Revision; use crate::errors::{internal_error, CollaborateError, CollaborateResult}; use crate::util::{cal_diff, make_operations_from_revisions, md5}; -use flowy_grid_data_model::revision::{ +use grid_rev_model::{ FieldRevision, FieldTypeRevision, FilterConfigurationRevision, FilterConfigurationsByFieldId, GridViewRevision, GroupConfigurationRevision, GroupConfigurationsByFieldId, LayoutRevision, }; diff --git a/shared-lib/folder-rev-model/Cargo.toml b/shared-lib/folder-rev-model/Cargo.toml index ee14f866dc..90976a13df 100644 --- a/shared-lib/folder-rev-model/Cargo.toml +++ b/shared-lib/folder-rev-model/Cargo.toml @@ -7,8 +7,8 @@ edition = "2018" [dependencies] bytes = "1.0" -strum = "0.24.1" -strum_macros = "0.24.3" +strum = "0.21" +strum_macros = "0.21" nanoid = "0.4.0" chrono = { version = "0.4" } serde = { version = "1.0", features = ["derive", "rc"] } diff --git a/shared-lib/flowy-grid-data-model/Cargo.toml b/shared-lib/grid-rev-model/Cargo.toml similarity index 61% rename from shared-lib/flowy-grid-data-model/Cargo.toml rename to shared-lib/grid-rev-model/Cargo.toml index 671fdbb4e6..edcee680ec 100644 --- a/shared-lib/flowy-grid-data-model/Cargo.toml +++ b/shared-lib/grid-rev-model/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "flowy-grid-data-model" +name = "grid-rev-model" version = "0.1.0" edition = "2021" @@ -13,13 +13,3 @@ serde_repr = "0.1" nanoid = "0.4.0" flowy-error-code = { path = "../flowy-error-code"} indexmap = {version = "1.9.1", features = ["serde"]} -tracing = { version = "0.1", features = ["log"] } - -[build-dependencies] -lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] } - -[features] -default = [] -backend = [] -frontend = [] -dart = ["lib-infra/dart"] \ No newline at end of file diff --git a/shared-lib/flowy-grid-data-model/src/revision/filter_rev.rs b/shared-lib/grid-rev-model/src/filter_rev.rs similarity index 100% rename from shared-lib/flowy-grid-data-model/src/revision/filter_rev.rs rename to shared-lib/grid-rev-model/src/filter_rev.rs diff --git a/shared-lib/flowy-grid-data-model/src/revision/grid_block.rs b/shared-lib/grid-rev-model/src/grid_block.rs similarity index 100% rename from shared-lib/flowy-grid-data-model/src/revision/grid_block.rs rename to shared-lib/grid-rev-model/src/grid_block.rs diff --git a/shared-lib/flowy-grid-data-model/src/revision/grid_rev.rs b/shared-lib/grid-rev-model/src/grid_rev.rs similarity index 99% rename from shared-lib/flowy-grid-data-model/src/revision/grid_rev.rs rename to shared-lib/grid-rev-model/src/grid_rev.rs index 9728de1fdb..5bf7b8c4ab 100644 --- a/shared-lib/flowy-grid-data-model/src/revision/grid_rev.rs +++ b/shared-lib/grid-rev-model/src/grid_rev.rs @@ -1,4 +1,4 @@ -use crate::revision::GridBlockRevision; +use crate::GridBlockRevision; use bytes::Bytes; use indexmap::IndexMap; use nanoid::nanoid; diff --git a/shared-lib/flowy-grid-data-model/src/revision/grid_setting_rev.rs b/shared-lib/grid-rev-model/src/grid_setting_rev.rs similarity index 95% rename from shared-lib/flowy-grid-data-model/src/revision/grid_setting_rev.rs rename to shared-lib/grid-rev-model/src/grid_setting_rev.rs index b8664a8bc3..f5a8e0d40c 100644 --- a/shared-lib/flowy-grid-data-model/src/revision/grid_setting_rev.rs +++ b/shared-lib/grid-rev-model/src/grid_setting_rev.rs @@ -1,4 +1,4 @@ -use crate::revision::{FieldRevision, FieldTypeRevision, FilterConfigurationRevision, GroupConfigurationRevision}; +use crate::{FieldRevision, FieldTypeRevision, FilterConfigurationRevision, GroupConfigurationRevision}; use indexmap::IndexMap; use nanoid::nanoid; use serde::{Deserialize, Serialize}; @@ -49,7 +49,7 @@ where .get_mut(field_id) .and_then(|object_rev_map| object_rev_map.get_mut(field_type)); if value.is_none() { - tracing::warn!("[Configuration] Can't find the {:?} with", std::any::type_name::()); + eprintln!("[Configuration] Can't find the {:?} with", std::any::type_name::()); } value } diff --git a/shared-lib/flowy-grid-data-model/src/revision/grid_view.rs b/shared-lib/grid-rev-model/src/grid_view.rs similarity index 95% rename from shared-lib/flowy-grid-data-model/src/revision/grid_view.rs rename to shared-lib/grid-rev-model/src/grid_view.rs index 06178d23c1..aa4dac5dea 100644 --- a/shared-lib/flowy-grid-data-model/src/revision/grid_view.rs +++ b/shared-lib/grid-rev-model/src/grid_view.rs @@ -1,4 +1,4 @@ -use crate::revision::{FilterConfiguration, GroupConfiguration}; +use crate::{FilterConfiguration, GroupConfiguration}; use nanoid::nanoid; use serde::{Deserialize, Serialize}; use serde_repr::*; @@ -71,7 +71,7 @@ pub struct RowOrderRevision { #[cfg(test)] mod tests { - use crate::revision::GridViewRevision; + use crate::GridViewRevision; #[test] fn grid_view_revision_serde_test() { diff --git a/shared-lib/flowy-grid-data-model/src/revision/group_rev.rs b/shared-lib/grid-rev-model/src/group_rev.rs similarity index 96% rename from shared-lib/flowy-grid-data-model/src/revision/group_rev.rs rename to shared-lib/grid-rev-model/src/group_rev.rs index 44a7a4e1f6..ff7940c7d5 100644 --- a/shared-lib/flowy-grid-data-model/src/revision/group_rev.rs +++ b/shared-lib/grid-rev-model/src/group_rev.rs @@ -1,4 +1,4 @@ -use crate::revision::{gen_grid_group_id, FieldTypeRevision}; +use crate::{gen_grid_group_id, FieldTypeRevision}; use serde::{Deserialize, Serialize}; use serde_json::Error; use serde_repr::*; @@ -166,7 +166,7 @@ impl std::default::Default for DateCondition { #[cfg(test)] mod tests { - use crate::revision::{GroupConfigurationRevision, SelectOptionGroupConfigurationRevision}; + use crate::{GroupConfigurationRevision, SelectOptionGroupConfigurationRevision}; #[test] fn group_configuration_serde_test() { diff --git a/shared-lib/flowy-grid-data-model/src/revision/mod.rs b/shared-lib/grid-rev-model/src/lib.rs similarity index 100% rename from shared-lib/flowy-grid-data-model/src/revision/mod.rs rename to shared-lib/grid-rev-model/src/lib.rs diff --git a/shared-lib/lib-ws/Cargo.toml b/shared-lib/lib-ws/Cargo.toml index 003bdf43bd..6fab8ce582 100644 --- a/shared-lib/lib-ws/Cargo.toml +++ b/shared-lib/lib-ws/Cargo.toml @@ -24,7 +24,7 @@ tracing = { version = "0.1", features = ["log"] } protobuf = {version = "2.18.0"} strum = "0.21" strum_macros = "0.21" -parking_lot = "0.11" +parking_lot = "0.12.1" dashmap = "5" [build-dependencies]