diff --git a/frontend/app_flowy/lib/startup/deps_resolver.dart b/frontend/app_flowy/lib/startup/deps_resolver.dart index b146fd04e7..0cf248e7e4 100644 --- a/frontend/app_flowy/lib/startup/deps_resolver.dart +++ b/frontend/app_flowy/lib/startup/deps_resolver.dart @@ -15,7 +15,7 @@ import 'package:app_flowy/workspace/presentation/home/home_stack.dart'; import 'package:app_flowy/workspace/presentation/home/menu/menu.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/app.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:get_it/get_it.dart'; diff --git a/frontend/app_flowy/lib/user/application/auth_service.dart b/frontend/app_flowy/lib/user/application/auth_service.dart index 1bbc0e8d19..28f7dc5d0e 100644 --- a/frontend/app_flowy/lib/user/application/auth_service.dart +++ b/frontend/app_flowy/lib/user/application/auth_service.dart @@ -1,6 +1,6 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show SignInPayload, SignUpPayload, UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show SignInPayload, SignUpPayload, UserProfile; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; class AuthService { diff --git a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart b/frontend/app_flowy/lib/user/application/sign_in_bloc.dart index 59b744cbff..45b6ee1eb5 100644 --- a/frontend/app_flowy/lib/user/application/sign_in_bloc.dart +++ b/frontend/app_flowy/lib/user/application/sign_in_bloc.dart @@ -2,7 +2,7 @@ import 'package:app_flowy/user/application/auth_service.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/protobuf/flowy-error-code/code.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart b/frontend/app_flowy/lib/user/application/sign_up_bloc.dart index 7c7cc43c54..b94a02bf09 100644 --- a/frontend/app_flowy/lib/user/application/sign_up_bloc.dart +++ b/frontend/app_flowy/lib/user/application/sign_up_bloc.dart @@ -2,7 +2,7 @@ import 'package:app_flowy/user/application/auth_service.dart'; import 'package:dartz/dartz.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_sdk/protobuf/flowy-error-code/code.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/user/application/user_listener.dart b/frontend/app_flowy/lib/user/application/user_listener.dart index 6d05a9252d..89fc393e2d 100644 --- a/frontend/app_flowy/lib/user/application/user_listener.dart +++ b/frontend/app_flowy/lib/user/application/user_listener.dart @@ -9,7 +9,7 @@ import 'dart:typed_data'; import 'package:flowy_infra/notifier.dart'; import 'package:flowy_sdk/protobuf/dart-notify/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/dart_notification.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-user/dart_notification.pb.dart' as user; import 'package:flowy_sdk/rust_stream.dart'; diff --git a/frontend/app_flowy/lib/user/application/user_service.dart b/frontend/app_flowy/lib/user/application/user_service.dart index 5c953dc2cc..8417a069f9 100644 --- a/frontend/app_flowy/lib/user/application/user_service.dart +++ b/frontend/app_flowy/lib/user/application/user_service.dart @@ -4,7 +4,7 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; class UserService { final String userId; diff --git a/frontend/app_flowy/lib/user/application/user_settings_service.dart b/frontend/app_flowy/lib/user/application/user_settings_service.dart index 7ef66296fb..eb93ab150d 100644 --- a/frontend/app_flowy/lib/user/application/user_settings_service.dart +++ b/frontend/app_flowy/lib/user/application/user_settings_service.dart @@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/flowy_sdk.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_setting.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_setting.pb.dart'; class UserSettingsService { Future getAppearanceSettings() async { diff --git a/frontend/app_flowy/lib/user/domain/auth_state.dart b/frontend/app_flowy/lib/user/domain/auth_state.dart index 96f2036e01..e2d3a33b09 100644 --- a/frontend/app_flowy/lib/user/domain/auth_state.dart +++ b/frontend/app_flowy/lib/user/domain/auth_state.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; part 'auth_state.freezed.dart'; diff --git a/frontend/app_flowy/lib/user/presentation/router.dart b/frontend/app_flowy/lib/user/presentation/router.dart index a0b6cd4f06..3bcfa11502 100644 --- a/frontend/app_flowy/lib/user/presentation/router.dart +++ b/frontend/app_flowy/lib/user/presentation/router.dart @@ -7,7 +7,7 @@ import 'package:app_flowy/user/presentation/welcome_screen.dart'; import 'package:app_flowy/workspace/presentation/home/home_screen.dart'; import 'package:flowy_infra/time/duration.dart'; import 'package:flowy_infra_ui/widget/route/animation.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-folder/protobuf.dart'; import 'package:flutter/material.dart'; diff --git a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart b/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart index 9a02863345..baa8ef0ccb 100644 --- a/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/sign_in_screen.dart @@ -10,7 +10,7 @@ import 'package:flowy_infra_ui/widget/rounded_input_field.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flowy_infra_ui/style_widget/snap_bar.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:dartz/dartz.dart'; diff --git a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart b/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart index 9f95a1db75..6a0b8f1d85 100644 --- a/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/sign_up_screen.dart @@ -8,7 +8,7 @@ import 'package:flowy_infra_ui/widget/rounded_button.dart'; import 'package:flowy_infra_ui/widget/rounded_input_field.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_infra_ui/style_widget/snap_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart index 719d5b52d4..c8fb9ba06b 100644 --- a/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/skip_log_in_screen.dart @@ -11,7 +11,7 @@ import 'package:flowy_sdk/log.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart index 6d5a4c30c6..60ec3bf8a2 100644 --- a/frontend/app_flowy/lib/user/presentation/welcome_screen.dart +++ b/frontend/app_flowy/lib/user/presentation/welcome_screen.dart @@ -6,7 +6,7 @@ import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart'; import 'package:flowy_infra_ui/style_widget/button.dart'; import 'package:flowy_infra_ui/widget/error_page.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:app_flowy/generated/locale_keys.g.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/appearance.dart b/frontend/app_flowy/lib/workspace/application/appearance.dart index 06473729a8..f3ff7801ce 100644 --- a/frontend/app_flowy/lib/workspace/application/appearance.dart +++ b/frontend/app_flowy/lib/workspace/application/appearance.dart @@ -4,7 +4,7 @@ import 'package:app_flowy/user/application/user_settings_service.dart'; import 'package:equatable/equatable.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_sdk/log.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_setting.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_setting.pb.dart'; import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart b/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart index 01ef2dba57..4b840634f5 100644 --- a/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/home/home_bloc.dart @@ -4,7 +4,7 @@ import 'package:flowy_sdk/log.dart'; import 'package:flowy_sdk/protobuf/flowy-error-code/code.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart' show CurrentWorkspaceSetting; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:dartz/dartz.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart index 1baa5c2354..7433c758b0 100644 --- a/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/menu/menu_user_bloc.dart @@ -3,7 +3,7 @@ import 'package:app_flowy/user/application/user_service.dart'; import 'package:flowy_sdk/log.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_profile.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:dartz/dartz.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart b/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart index bf2abf1a6a..1ee8de94fd 100644 --- a/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart +++ b/frontend/app_flowy/lib/workspace/application/workspace/workspace_listener.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:app_flowy/core/folder_notification.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_infra/notifier.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-folder/app.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart index e11906ece4..f205daabac 100644 --- a/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart +++ b/frontend/app_flowy/lib/workspace/presentation/home/home_screen.dart @@ -5,7 +5,7 @@ import 'package:app_flowy/workspace/presentation/widgets/float_bubble/question_b import 'package:app_flowy/startup/startup.dart'; import 'package:flowy_sdk/log.dart'; import 'package:flowy_infra_ui/style_widget/container.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-folder/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart index f53ebd1bf0..01debf6196 100644 --- a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart +++ b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu.dart @@ -10,7 +10,7 @@ import 'package:flowy_infra/size.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/workspace.pb.dart'; import 'package:flutter/material.dart'; diff --git a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart index 6b6849e43d..6b75c9ef3f 100644 --- a/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart +++ b/frontend/app_flowy/lib/workspace/presentation/home/menu/menu_user.dart @@ -6,7 +6,7 @@ import 'package:flowy_infra/size.dart'; import 'package:flowy_infra/theme.dart'; import 'package:flowy_infra_ui/style_widget/text.dart'; import 'package:flowy_infra_ui/widget/spacing.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart' show UserProfile; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart' show UserProfile; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:app_flowy/generated/locale_keys.g.dart'; diff --git a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart index 6b1bc579e4..3dae52080e 100644 --- a/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart +++ b/frontend/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart @@ -5,7 +5,6 @@ import 'package:flowy_sdk/log.dart'; import 'package:flowy_sdk/protobuf/dart-ffi/ffi_response.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-net/network_state.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-user/event_map.pb.dart'; import 'package:isolates/isolates.dart'; import 'package:isolates/ports.dart'; import 'package:ffi/ffi.dart'; @@ -14,7 +13,7 @@ import 'package:flutter/services.dart'; import 'dart:async'; import 'dart:typed_data'; import 'package:flowy_sdk/ffi.dart' as ffi; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-folder/protobuf.dart'; import 'package:flowy_sdk/protobuf/flowy-text-block/protobuf.dart'; diff --git a/frontend/app_flowy/test/util/test_env.dart b/frontend/app_flowy/test/util/test_env.dart index 62482bc25b..40006295a4 100644 --- a/frontend/app_flowy/test/util/test_env.dart +++ b/frontend/app_flowy/test/util/test_env.dart @@ -1,7 +1,7 @@ import 'package:app_flowy/startup/startup.dart'; import 'package:app_flowy/user/application/auth_service.dart'; import 'package:flowy_infra/uuid.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/frontend/app_flowy/test/workspace_bloc_test.dart b/frontend/app_flowy/test/workspace_bloc_test.dart index f4dba63a11..680726b401 100644 --- a/frontend/app_flowy/test/workspace_bloc_test.dart +++ b/frontend/app_flowy/test/workspace_bloc_test.dart @@ -1,6 +1,6 @@ import 'package:app_flowy/startup/startup.dart'; import 'package:app_flowy/workspace/application/workspace/welcome_bloc.dart'; -import 'package:flowy_sdk/protobuf/flowy-user-data-model/protobuf.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:bloc_test/bloc_test.dart'; diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index b3916ec2ec..d452c1a025 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -765,11 +765,11 @@ dependencies = [ [[package]] name = "fake" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6479fa2c7e83ddf8be7d435421e093b072ca891b99a49bc84eba098f4044f818" +checksum = "4d68f517805463f3a896a9d29c1d6ff09d3579ded64a7201b4069f8f9c0d52fd" dependencies = [ - "rand 0.7.3", + "rand 0.8.5", ] [[package]] @@ -999,7 +999,6 @@ dependencies = [ "flowy-sync", "flowy-text-block", "flowy-user", - "flowy-user-data-model", "futures-util", "http-flowy", "hyper", @@ -1179,14 +1178,16 @@ name = "flowy-user" version = "0.1.0" dependencies = [ "bytes", + "claim 0.4.0", "dart-notify", "diesel", "diesel_derives", + "fake", + "fancy-regex", "flowy-database", "flowy-derive", "flowy-error", "flowy-test", - "flowy-user-data-model", "futures", "lazy_static", "lib-dispatch", @@ -1196,28 +1197,17 @@ dependencies = [ "once_cell", "parking_lot 0.11.2", "protobuf", + "quickcheck", + "quickcheck_macros", + "rand 0.8.5", + "rand_core 0.6.3", "serde", "serde_json", + "serial_test", "strum", "strum_macros", "tokio", "tracing", -] - -[[package]] -name = "flowy-user-data-model" -version = "0.1.0" -dependencies = [ - "bytes", - "derive_more", - "fancy-regex", - "flowy-derive", - "flowy-error-code", - "lazy_static", - "lib-infra", - "log", - "protobuf", - "serde", "unicode-segmentation", "validator", ] @@ -3613,9 +3603,9 @@ dependencies = [ [[package]] name = "validator" -version = "0.12.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" +checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5" dependencies = [ "idna", "lazy_static", @@ -3624,15 +3614,8 @@ dependencies = [ "serde_derive", "serde_json", "url", - "validator_types", ] -[[package]] -name = "validator_types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml index de149a4d9b..e099df9629 100644 --- a/frontend/rust-lib/flowy-folder/Cargo.toml +++ b/frontend/rust-lib/flowy-folder/Cargo.toml @@ -33,8 +33,8 @@ lazy_static = "1.4.0" serde = { version = "1.0", features = ["derive"] } tracing = { version = "0.1", features = ["log"] } bytes = { version = "1.0" } - unicode-segmentation = "1.8" + [dev-dependencies] serde_json = "1.0" flowy-folder = { path = "../flowy-folder", features = ["flowy_unit_test"]} diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.toml index 5ba64866e5..6096f18ea3 100644 --- a/frontend/rust-lib/flowy-net/Cargo.toml +++ b/frontend/rust-lib/flowy-net/Cargo.toml @@ -11,7 +11,6 @@ flowy-error = { path = "../flowy-error", features = ["collaboration", "http_serv flowy-derive = { path = "../../../shared-lib/flowy-derive" } flowy-sync = { path = "../../../shared-lib/flowy-sync"} flowy-folder-data-model = { path = "../../../shared-lib/flowy-folder-data-model"} -flowy-user-data-model = { path = "../../../shared-lib/flowy-user-data-model"} flowy-folder = { path = "../flowy-folder" } flowy-user = { path = "../flowy-user" } flowy-text-block = { path = "../flowy-text-block" } @@ -46,7 +45,6 @@ dart = [ "flowy-user/dart", "flowy-sync/dart", "flowy-error/dart", - "flowy-user-data-model/dart", "flowy-folder-data-model/dart" ] diff --git a/frontend/rust-lib/flowy-net/src/http_server/user.rs b/frontend/rust-lib/flowy-net/src/http_server/user.rs index 875f696e21..faf5621161 100644 --- a/frontend/rust-lib/flowy-net/src/http_server/user.rs +++ b/frontend/rust-lib/flowy-net/src/http_server/user.rs @@ -1,9 +1,9 @@ use crate::{configuration::*, request::HttpRequestBuilder}; use flowy_error::FlowyError; -use flowy_user::event_map::UserCloudService; -use flowy_user_data_model::entities::{ +use flowy_user::entities::{ SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile, }; +use flowy_user::event_map::UserCloudService; use http_flowy::errors::ServerError; use lib_infra::future::FutureResult; diff --git a/frontend/rust-lib/flowy-net/src/local_server/server.rs b/frontend/rust-lib/flowy-net/src/local_server/server.rs index ec7b9db0cd..cdec4d0c48 100644 --- a/frontend/rust-lib/flowy-net/src/local_server/server.rs +++ b/frontend/rust-lib/flowy-net/src/local_server/server.rs @@ -262,10 +262,10 @@ use flowy_folder_data_model::revision::{ gen_app_id, gen_workspace_id, AppRevision, TrashRevision, ViewRevision, WorkspaceRevision, }; use flowy_text_block::BlockCloudService; -use flowy_user::event_map::UserCloudService; -use flowy_user_data_model::entities::{ +use flowy_user::entities::{ SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile, }; +use flowy_user::event_map::UserCloudService; use lib_infra::{future::FutureResult, util::timestamp}; impl FolderCouldServiceV1 for LocalServer { diff --git a/frontend/rust-lib/flowy-test/Cargo.toml b/frontend/rust-lib/flowy-test/Cargo.toml index 70cb341002..1ce06ff15b 100644 --- a/frontend/rust-lib/flowy-test/Cargo.toml +++ b/frontend/rust-lib/flowy-test/Cargo.toml @@ -31,7 +31,7 @@ nanoid = "0.4.0" [dev-dependencies] quickcheck = "1.0.3" quickcheck_macros = "0.9.1" -fake = "~2.3.0" +fake = "2.4.3" claim = "0.4.0" futures = "0.3.15" serial_test = "0.5.1" diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml index 96e6141ed6..46490817ce 100644 --- a/frontend/rust-lib/flowy-user/Cargo.toml +++ b/frontend/rust-lib/flowy-user/Cargo.toml @@ -6,7 +6,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -flowy-user-data-model = { path = "../../../shared-lib/flowy-user-data-model" } flowy-derive = { path = "../../../shared-lib/flowy-derive" } flowy-database = { path = "../flowy-database" } flowy-error = { path = "../flowy-error", features = ["db", "http_server"] } @@ -29,12 +28,21 @@ parking_lot = "0.11" strum = "0.21" strum_macros = "0.21" tokio = { version = "1", features = ["rt"] } - +unicode-segmentation = "1.8" +validator = "0.15" +fancy-regex = "0.10.0" [dev-dependencies] flowy-test = { path = "../flowy-test" } -futures = "0.3.15" nanoid = "0.4.0" +quickcheck = "1.0.3" +quickcheck_macros = "0.9.1" +fake = "2.4.3" +claim = "0.4.0" +futures = "0.3.15" +serial_test = "0.5.1" +rand_core = "0.6.3" +rand = "0.8.5" [features] dart = ["lib-infra/dart"] diff --git a/frontend/rust-lib/flowy-user/Flowy.toml b/frontend/rust-lib/flowy-user/Flowy.toml index 9994320410..7ca5466b30 100644 --- a/frontend/rust-lib/flowy-user/Flowy.toml +++ b/frontend/rust-lib/flowy-user/Flowy.toml @@ -1,3 +1,3 @@ # Check out the FlowyConfig (located in flowy_toml.rs) for more details. -proto_input = ["src/event_map.rs", "src/dart_notification.rs"] +proto_input = ["src/entities", "src/event_map.rs", "src/dart_notification.rs"] event_files = ["src/event_map.rs"] \ No newline at end of file diff --git a/shared-lib/flowy-user-data-model/src/entities/auth.rs b/frontend/rust-lib/flowy-user/src/entities/auth.rs similarity index 95% rename from shared-lib/flowy-user-data-model/src/entities/auth.rs rename to frontend/rust-lib/flowy-user/src/entities/auth.rs index 4e9cf59243..14224ae231 100644 --- a/shared-lib/flowy-user-data-model/src/entities/auth.rs +++ b/frontend/rust-lib/flowy-user/src/entities/auth.rs @@ -1,8 +1,7 @@ -use std::convert::TryInto; - +use crate::entities::parser::{UserEmail, UserName, UserPassword}; +use crate::errors::ErrorCode; use flowy_derive::ProtoBuf; - -use crate::{errors::*, parser::*}; +use std::convert::TryInto; #[derive(ProtoBuf, Default)] pub struct SignInPayload { diff --git a/shared-lib/flowy-user-data-model/src/entities/mod.rs b/frontend/rust-lib/flowy-user/src/entities/mod.rs similarity index 88% rename from shared-lib/flowy-user-data-model/src/entities/mod.rs rename to frontend/rust-lib/flowy-user/src/entities/mod.rs index e7214db5ca..18e64885dc 100644 --- a/shared-lib/flowy-user-data-model/src/entities/mod.rs +++ b/frontend/rust-lib/flowy-user/src/entities/mod.rs @@ -3,5 +3,6 @@ pub use user_profile::*; pub use user_setting::*; pub mod auth; +pub mod parser; mod user_profile; mod user_setting; diff --git a/shared-lib/flowy-user-data-model/src/parser/mod.rs b/frontend/rust-lib/flowy-user/src/entities/parser/mod.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/mod.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/mod.rs diff --git a/shared-lib/flowy-user-data-model/src/parser/user_email.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_email.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/user_email.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/user_email.rs diff --git a/shared-lib/flowy-user-data-model/src/parser/user_id.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_id.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/user_id.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/user_id.rs diff --git a/shared-lib/flowy-user-data-model/src/parser/user_name.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_name.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/user_name.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/user_name.rs diff --git a/shared-lib/flowy-user-data-model/src/parser/user_password.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_password.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/user_password.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/user_password.rs diff --git a/shared-lib/flowy-user-data-model/src/parser/user_workspace.rs b/frontend/rust-lib/flowy-user/src/entities/parser/user_workspace.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/parser/user_workspace.rs rename to frontend/rust-lib/flowy-user/src/entities/parser/user_workspace.rs diff --git a/shared-lib/flowy-user-data-model/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs similarity index 97% rename from shared-lib/flowy-user-data-model/src/entities/user_profile.rs rename to frontend/rust-lib/flowy-user/src/entities/user_profile.rs index b5519e6812..82553e8050 100644 --- a/shared-lib/flowy-user-data-model/src/entities/user_profile.rs +++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs @@ -2,8 +2,8 @@ use flowy_derive::ProtoBuf; use std::convert::TryInto; use crate::{ + entities::parser::{UserEmail, UserId, UserName, UserPassword}, errors::ErrorCode, - parser::{UserEmail, UserId, UserName, UserPassword}, }; #[derive(Default, ProtoBuf)] diff --git a/shared-lib/flowy-user-data-model/src/entities/user_setting.rs b/frontend/rust-lib/flowy-user/src/entities/user_setting.rs similarity index 100% rename from shared-lib/flowy-user-data-model/src/entities/user_setting.rs rename to frontend/rust-lib/flowy-user/src/entities/user_setting.rs diff --git a/frontend/rust-lib/flowy-user/src/event_map.rs b/frontend/rust-lib/flowy-user/src/event_map.rs index 8445d4a47c..348da177d3 100644 --- a/frontend/rust-lib/flowy-user/src/event_map.rs +++ b/frontend/rust-lib/flowy-user/src/event_map.rs @@ -1,7 +1,7 @@ -use crate::{errors::FlowyError, handlers::*, services::UserSession}; -use flowy_user_data_model::entities::{ +use crate::entities::{ SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile, }; +use crate::{errors::FlowyError, handlers::*, services::UserSession}; use lib_dispatch::prelude::*; use lib_infra::future::FutureResult; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs b/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs index b5d667bcbe..22a17d887c 100644 --- a/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs +++ b/frontend/rust-lib/flowy-user/src/handlers/auth_handler.rs @@ -1,6 +1,6 @@ +use crate::entities::*; use crate::services::UserSession; use flowy_error::FlowyError; -use flowy_user_data_model::entities::*; use lib_dispatch::prelude::*; use std::{convert::TryInto, sync::Arc}; diff --git a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs b/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs index c635f326c1..6ee62519e7 100644 --- a/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs +++ b/frontend/rust-lib/flowy-user/src/handlers/user_handler.rs @@ -1,8 +1,8 @@ -use crate::{errors::FlowyError, services::UserSession}; -use flowy_database::kv::KV; -use flowy_user_data_model::entities::{ +use crate::entities::{ AppearanceSettings, UpdateUserProfileParams, UpdateUserProfilePayload, UserProfile, APPEARANCE_DEFAULT_THEME, }; +use crate::{errors::FlowyError, services::UserSession}; +use flowy_database::kv::KV; use lib_dispatch::prelude::*; use std::{convert::TryInto, sync::Arc}; diff --git a/frontend/rust-lib/flowy-user/src/lib.rs b/frontend/rust-lib/flowy-user/src/lib.rs index 18ef8e72e0..dea55778fd 100644 --- a/frontend/rust-lib/flowy-user/src/lib.rs +++ b/frontend/rust-lib/flowy-user/src/lib.rs @@ -1,4 +1,5 @@ mod dart_notification; +pub mod entities; pub mod event_map; mod handlers; pub mod protobuf; @@ -11,7 +12,3 @@ extern crate flowy_database; pub mod errors { pub use flowy_error::*; } - -pub mod entities { - pub use flowy_user_data_model::entities::*; -} diff --git a/frontend/rust-lib/flowy-user/src/services/database.rs b/frontend/rust-lib/flowy-user/src/services/database.rs index 6a76b0a021..eaf5b7f6cb 100644 --- a/frontend/rust-lib/flowy-user/src/services/database.rs +++ b/frontend/rust-lib/flowy-user/src/services/database.rs @@ -1,7 +1,7 @@ +use crate::entities::{SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile}; use flowy_database::ConnectionPool; use flowy_database::{schema::user_table, DBConnection, Database}; use flowy_error::{ErrorCode, FlowyError}; -use flowy_user_data_model::entities::{SignInResponse, SignUpResponse, UpdateUserProfileParams, UserProfile}; use lazy_static::lazy_static; use parking_lot::RwLock; use std::{collections::HashMap, sync::Arc, time::Duration}; diff --git a/frontend/rust-lib/flowy-user/src/services/notifier.rs b/frontend/rust-lib/flowy-user/src/services/notifier.rs index 6bebc33cfb..9500988d99 100644 --- a/frontend/rust-lib/flowy-user/src/services/notifier.rs +++ b/frontend/rust-lib/flowy-user/src/services/notifier.rs @@ -1,4 +1,4 @@ -use flowy_user_data_model::entities::UserProfile; +use crate::entities::UserProfile; use tokio::sync::{broadcast, mpsc}; #[derive(Clone)] diff --git a/frontend/rust-lib/flowy-user/src/services/user_session.rs b/frontend/rust-lib/flowy-user/src/services/user_session.rs index 8167b05a19..48e6ef9661 100644 --- a/frontend/rust-lib/flowy-user/src/services/user_session.rs +++ b/frontend/rust-lib/flowy-user/src/services/user_session.rs @@ -1,3 +1,6 @@ +use crate::entities::{ + SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile, +}; use crate::{ dart_notification::*, errors::{ErrorCode, FlowyError}, @@ -14,9 +17,6 @@ use flowy_database::{ schema::{user_table, user_table::dsl}, DBConnection, ExpressionMethods, UserDatabaseConnection, }; -use flowy_user_data_model::entities::{ - SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserProfileParams, UserProfile, -}; use parking_lot::RwLock; use serde::{Deserialize, Serialize}; use std::sync::Arc; diff --git a/frontend/rust-lib/flowy-user/tests/event/auth_test.rs b/frontend/rust-lib/flowy-user/tests/event/auth_test.rs index f03fb30e7b..39b22a9af0 100644 --- a/frontend/rust-lib/flowy-user/tests/event/auth_test.rs +++ b/frontend/rust-lib/flowy-user/tests/event/auth_test.rs @@ -1,7 +1,7 @@ use crate::helper::*; use flowy_test::{event_builder::UserModuleEventBuilder, FlowySDKTest}; +use flowy_user::entities::{SignInPayload, SignUpPayload, UserProfile}; use flowy_user::{errors::ErrorCode, event_map::UserEvent::*}; -use flowy_user_data_model::entities::{SignInPayload, SignUpPayload, UserProfile}; #[tokio::test] async fn sign_up_with_invalid_email() { diff --git a/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs b/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs index 49e959dfef..b01a533336 100644 --- a/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs +++ b/frontend/rust-lib/flowy-user/tests/event/user_profile_test.rs @@ -1,7 +1,7 @@ use crate::helper::*; use flowy_test::{event_builder::UserModuleEventBuilder, FlowySDKTest}; +use flowy_user::entities::{UpdateUserProfilePayload, UserProfile}; use flowy_user::{errors::ErrorCode, event_map::UserEvent::*}; -use flowy_user_data_model::entities::{UpdateUserProfilePayload, UserProfile}; use nanoid::nanoid; // use serial_test::*; diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock index 04b92a09fb..62d70be943 100644 --- a/shared-lib/Cargo.lock +++ b/shared-lib/Cargo.lock @@ -186,15 +186,6 @@ dependencies = [ "phf_codegen", ] -[[package]] -name = "claim" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ad37958d55b29a7088909368968d2fe876a24c203f8441195130f3b15194b9" -dependencies = [ - "autocfg", -] - [[package]] name = "cmd_lib" version = "1.3.0" @@ -350,15 +341,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fake" -version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a8531dd3a64fd1cfbe92fad4160bc2060489c6195fe847e045e5788f710bae" -dependencies = [ - "rand 0.8.5", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -484,32 +466,6 @@ dependencies = [ "url", ] -[[package]] -name = "flowy-user-data-model" -version = "0.1.0" -dependencies = [ - "bytes", - "claim", - "derive_more", - "fake", - "fancy-regex", - "flowy-derive", - "flowy-error-code", - "futures", - "lazy_static", - "lib-infra", - "log", - "protobuf", - "quickcheck", - "quickcheck_macros", - "rand 0.8.5", - "rand_core 0.6.3", - "serde", - "serial_test", - "unicode-segmentation", - "validator", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1400,28 +1356,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger", - "log", - "rand 0.8.5", -] - -[[package]] -name = "quickcheck_macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "quote" version = "1.0.10" @@ -1637,28 +1571,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serial_test" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" -dependencies = [ - "lazy_static", - "parking_lot 0.11.2", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sha-1" version = "0.8.2" @@ -2106,28 +2018,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "validator" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" -dependencies = [ - "idna", - "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" - [[package]] name = "version_check" version = "0.9.3" diff --git a/shared-lib/Cargo.toml b/shared-lib/Cargo.toml index 370c4d7f31..1ddded168d 100644 --- a/shared-lib/Cargo.toml +++ b/shared-lib/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "flowy-user-data-model", "flowy-folder-data-model", "flowy-sync", "lib-ot", diff --git a/shared-lib/flowy-user-data-model/Cargo.toml b/shared-lib/flowy-user-data-model/Cargo.toml deleted file mode 100644 index 916a6c79f9..0000000000 --- a/shared-lib/flowy-user-data-model/Cargo.toml +++ /dev/null @@ -1,35 +0,0 @@ -[package] -name = "flowy-user-data-model" -version = "0.1.0" -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -flowy-derive = { path = "../flowy-derive" } -flowy-error-code = { path = "../flowy-error-code" } -protobuf = {version = "2.18.0"} -bytes = "1.0" -unicode-segmentation = "1.8" -derive_more = {version = "0.99", features = ["display"]} -serde = { version = "1.0", features = ["derive"] } -validator = "0.12.0" -log = "0.4.14" -fancy-regex = "0.10.0" -lazy_static = "1.4" - -[build-dependencies] -lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] } - -[dev-dependencies] -quickcheck = "1.0.3" -quickcheck_macros = "0.9.1" -fake = "2.4.3" -claim = "0.4.0" -futures = "0.3.15" -serial_test = "0.5.1" -rand_core = "0.6.3" -rand = "0.8.5" - -[features] -dart = ["lib-infra/dart", "flowy-error-code/dart"] diff --git a/shared-lib/flowy-user-data-model/Flowy.toml b/shared-lib/flowy-user-data-model/Flowy.toml deleted file mode 100644 index 5e3ca53bf2..0000000000 --- a/shared-lib/flowy-user-data-model/Flowy.toml +++ /dev/null @@ -1,2 +0,0 @@ -# Check out the FlowyConfig (located in flowy_toml.rs) for more details. -proto_input = ["src/entities", "src/errors.rs"] diff --git a/shared-lib/flowy-user-data-model/build.rs b/shared-lib/flowy-user-data-model/build.rs deleted file mode 100644 index e897c3690d..0000000000 --- a/shared-lib/flowy-user-data-model/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -use lib_infra::code_gen; - -fn main() { - code_gen::protobuf_file::gen(env!("CARGO_PKG_NAME")); -} diff --git a/shared-lib/flowy-user-data-model/src/lib.rs b/shared-lib/flowy-user-data-model/src/lib.rs deleted file mode 100644 index eb967a2520..0000000000 --- a/shared-lib/flowy-user-data-model/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod entities; -pub mod parser; -pub mod protobuf; - -pub mod errors { - pub use flowy_error_code::ErrorCode; -}