From bf198783e174585f31a442ae13ab495e8a95c3e7 Mon Sep 17 00:00:00 2001 From: appflowy Date: Tue, 13 Jul 2021 14:28:01 +0800 Subject: [PATCH] [code gen]: generate the protobuf files in corresponding module --- .idea/appflowy_client.iml | 1 + .../lib/home/presentation/home_screen.dart | 2 +- .../application/sign_in/sign_in_bloc.dart | 3 +- app_flowy/lib/user/domain/interface.dart | 3 +- .../lib/user/infrastructure/auth_repo.dart | 5 +- .../user/infrastructure/interface_impl.dart | 3 +- .../presentation/sign_in/widgets/body.dart | 3 +- app_flowy/lib/welcome/domain/auth_state.dart | 3 +- app_flowy/lib/welcome/domain/interface.dart | 2 +- .../infrastructure/interface_impl.dart | 2 +- .../flowy_sdk/lib/dispatch/dispatch.dart | 7 ++- .../flowy_sdk/lib/dispatch/error.dart | 9 +-- .../packages/flowy_sdk/lib/protobuf.dart | 10 ---- .../{ => dart-ffi}/ffi_request.pb.dart | 0 .../{ => dart-ffi}/ffi_request.pbenum.dart | 0 .../{ => dart-ffi}/ffi_request.pbjson.dart | 0 .../{ => dart-ffi}/ffi_request.pbserver.dart | 0 .../{ => dart-ffi}/ffi_response.pb.dart | 0 .../{ => dart-ffi}/ffi_response.pbenum.dart | 0 .../{ => dart-ffi}/ffi_response.pbjson.dart | 0 .../{ => dart-ffi}/ffi_response.pbserver.dart | 0 .../lib/protobuf/dart-ffi/protobuf.dart | 3 + .../lib/protobuf/{ => flowy-infra}/kv.pb.dart | 0 .../protobuf/{ => flowy-infra}/kv.pbenum.dart | 0 .../protobuf/{ => flowy-infra}/kv.pbjson.dart | 0 .../{ => flowy-infra}/kv.pbserver.dart | 0 .../lib/protobuf/flowy-infra/protobuf.dart | 2 + .../protobuf/{ => flowy-user}/errors.pb.dart | 0 .../{ => flowy-user}/errors.pbenum.dart | 0 .../{ => flowy-user}/errors.pbjson.dart | 0 .../{ => flowy-user}/errors.pbserver.dart | 0 .../protobuf/{ => flowy-user}/event.pb.dart | 0 .../{ => flowy-user}/event.pbenum.dart | 0 .../{ => flowy-user}/event.pbjson.dart | 0 .../{ => flowy-user}/event.pbserver.dart | 0 .../lib/protobuf/flowy-user/protobuf.dart | 7 +++ .../protobuf/{ => flowy-user}/sign_in.pb.dart | 0 .../{ => flowy-user}/sign_in.pbenum.dart | 0 .../{ => flowy-user}/sign_in.pbjson.dart | 0 .../{ => flowy-user}/sign_in.pbserver.dart | 0 .../protobuf/{ => flowy-user}/sign_up.pb.dart | 0 .../{ => flowy-user}/sign_up.pbenum.dart | 0 .../{ => flowy-user}/sign_up.pbjson.dart | 0 .../{ => flowy-user}/sign_up.pbserver.dart | 0 .../{ => flowy-user}/user_detail.pb.dart | 0 .../{ => flowy-user}/user_detail.pbenum.dart | 0 .../{ => flowy-user}/user_detail.pbjson.dart | 0 .../user_detail.pbserver.dart | 0 .../{ => flowy-user}/user_table.pb.dart | 0 .../{ => flowy-user}/user_table.pbenum.dart | 0 .../{ => flowy-user}/user_table.pbjson.dart | 0 .../{ => flowy-user}/user_table.pbserver.dart | 0 .../protobuf/flowy-workspace/protobuf.dart | 1 + rust-lib/Cargo.toml | 1 + rust-lib/flowy-infra/src/protobuf/model/kv.rs | 40 ++++++------- .../flowy-infra/src/protobuf/proto/kv.proto | 1 + rust-lib/flowy-workspace/Cargo.toml | 19 ++++++ rust-lib/flowy-workspace/Flowy.toml | 6 ++ rust-lib/flowy-workspace/src/entities/mod.rs | 0 rust-lib/flowy-workspace/src/errors.rs | 0 rust-lib/flowy-workspace/src/event.rs | 0 rust-lib/flowy-workspace/src/lib.rs | 5 ++ rust-lib/flowy-workspace/src/module.rs | 0 rust-lib/flowy-workspace/src/protobuf/mod.rs | 4 ++ .../flowy-workspace/src/protobuf/model/mod.rs | 1 + .../flowy-workspace/src/sql_tables/mod.rs | 0 scripts/flowy-tool/src/proto/proto_gen.rs | 58 +++++++++---------- scripts/flowy-tool/src/proto/proto_info.rs | 10 ++++ scripts/flowy-tool/src/util/file.rs | 2 +- 69 files changed, 126 insertions(+), 87 deletions(-) delete mode 100644 app_flowy/packages/flowy_sdk/lib/protobuf.dart rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_request.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_request.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_request.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_request.pbserver.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_response.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_response.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_response.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => dart-ffi}/ffi_response.pbserver.dart (100%) create mode 100644 app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/protobuf.dart rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-infra}/kv.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-infra}/kv.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-infra}/kv.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-infra}/kv.pbserver.dart (100%) create mode 100644 app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/protobuf.dart rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/errors.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/errors.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/errors.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/errors.pbserver.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/event.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/event.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/event.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/event.pbserver.dart (100%) create mode 100644 app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/protobuf.dart rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_in.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_in.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_in.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_in.pbserver.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_up.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_up.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_up.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/sign_up.pbserver.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_detail.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_detail.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_detail.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_detail.pbserver.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_table.pb.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_table.pbenum.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_table.pbjson.dart (100%) rename app_flowy/packages/flowy_sdk/lib/protobuf/{ => flowy-user}/user_table.pbserver.dart (100%) create mode 100644 app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace/protobuf.dart create mode 100644 rust-lib/flowy-workspace/Cargo.toml create mode 100644 rust-lib/flowy-workspace/Flowy.toml create mode 100644 rust-lib/flowy-workspace/src/entities/mod.rs create mode 100644 rust-lib/flowy-workspace/src/errors.rs create mode 100644 rust-lib/flowy-workspace/src/event.rs create mode 100644 rust-lib/flowy-workspace/src/lib.rs create mode 100644 rust-lib/flowy-workspace/src/module.rs create mode 100644 rust-lib/flowy-workspace/src/protobuf/mod.rs create mode 100644 rust-lib/flowy-workspace/src/protobuf/model/mod.rs create mode 100644 rust-lib/flowy-workspace/src/sql_tables/mod.rs diff --git a/.idea/appflowy_client.iml b/.idea/appflowy_client.iml index 1e204770fb..5379054293 100644 --- a/.idea/appflowy_client.iml +++ b/.idea/appflowy_client.iml @@ -19,6 +19,7 @@ + diff --git a/app_flowy/lib/home/presentation/home_screen.dart b/app_flowy/lib/home/presentation/home_screen.dart index 315f7de875..b31ce4a174 100644 --- a/app_flowy/lib/home/presentation/home_screen.dart +++ b/app_flowy/lib/home/presentation/home_screen.dart @@ -5,7 +5,7 @@ import 'package:app_flowy/home/presentation/widgets/prelude.dart'; import 'package:app_flowy/startup/startup.dart'; import 'package:flowy_infra/flowy_logger.dart'; import 'package:flowy_infra_ui/style_widget/styled_container.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/app_flowy/lib/user/application/sign_in/sign_in_bloc.dart b/app_flowy/lib/user/application/sign_in/sign_in_bloc.dart index f1c4de04ec..08d8d71aac 100644 --- a/app_flowy/lib/user/application/sign_in/sign_in_bloc.dart +++ b/app_flowy/lib/user/application/sign_in/sign_in_bloc.dart @@ -1,7 +1,6 @@ import 'package:app_flowy/user/domain/interface.dart'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; // ignore: import_of_legacy_library_into_null_safe import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/app_flowy/lib/user/domain/interface.dart b/app_flowy/lib/user/domain/interface.dart index 26849ee528..723cdbafd4 100644 --- a/app_flowy/lib/user/domain/interface.dart +++ b/app_flowy/lib/user/domain/interface.dart @@ -1,5 +1,4 @@ -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:dartz/dartz.dart'; abstract class IAuth { diff --git a/app_flowy/lib/user/infrastructure/auth_repo.dart b/app_flowy/lib/user/infrastructure/auth_repo.dart index 0108f5bccc..4f9b091c5f 100644 --- a/app_flowy/lib/user/infrastructure/auth_repo.dart +++ b/app_flowy/lib/user/infrastructure/auth_repo.dart @@ -1,9 +1,6 @@ import 'package:dartz/dartz.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/sign_in.pb.dart'; -import 'package:flowy_sdk/protobuf/sign_up.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; class AuthRepository { Future> signIn( diff --git a/app_flowy/lib/user/infrastructure/interface_impl.dart b/app_flowy/lib/user/infrastructure/interface_impl.dart index ca224f42cf..f7ddd74da4 100644 --- a/app_flowy/lib/user/infrastructure/interface_impl.dart +++ b/app_flowy/lib/user/infrastructure/interface_impl.dart @@ -1,7 +1,6 @@ import 'package:app_flowy/user/application/sign_in/sign_in_bloc.dart'; import 'package:dartz/dartz.dart'; -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:get_it/get_it.dart'; import 'package:app_flowy/user/domain/interface.dart'; diff --git a/app_flowy/lib/user/presentation/sign_in/widgets/body.dart b/app_flowy/lib/user/presentation/sign_in/widgets/body.dart index c7fa470338..7021dd740b 100644 --- a/app_flowy/lib/user/presentation/sign_in/widgets/body.dart +++ b/app_flowy/lib/user/presentation/sign_in/widgets/body.dart @@ -5,8 +5,7 @@ import 'package:app_flowy/user/presentation/sign_in/widgets/background.dart'; import 'package:dartz/dartz.dart'; import 'package:flowy_infra_ui/widget/rounded_button.dart'; import 'package:flowy_infra_ui/widget/rounded_input_field.dart'; -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/app_flowy/lib/welcome/domain/auth_state.dart b/app_flowy/lib/welcome/domain/auth_state.dart index 31c9ed0463..b8fb0c7456 100644 --- a/app_flowy/lib/welcome/domain/auth_state.dart +++ b/app_flowy/lib/welcome/domain/auth_state.dart @@ -1,5 +1,4 @@ -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; part 'auth_state.freezed.dart'; diff --git a/app_flowy/lib/welcome/domain/interface.dart b/app_flowy/lib/welcome/domain/interface.dart index 539344fb99..7ef7b5959c 100644 --- a/app_flowy/lib/welcome/domain/interface.dart +++ b/app_flowy/lib/welcome/domain/interface.dart @@ -1,4 +1,4 @@ -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter/widgets.dart'; import 'auth_state.dart'; diff --git a/app_flowy/lib/welcome/infrastructure/interface_impl.dart b/app_flowy/lib/welcome/infrastructure/interface_impl.dart index ddbb421a6d..d060aff1e1 100644 --- a/app_flowy/lib/welcome/infrastructure/interface_impl.dart +++ b/app_flowy/lib/welcome/infrastructure/interface_impl.dart @@ -8,7 +8,7 @@ import 'package:app_flowy/welcome/application/welcome_bloc.dart'; import 'package:app_flowy/welcome/domain/auth_state.dart'; import 'package:app_flowy/welcome/domain/interface.dart'; import 'package:flowy_sdk/dispatch/dispatch.dart'; -import 'package:flowy_sdk/protobuf/user_detail.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:get_it/get_it.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart b/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart index ac816efd5c..f3e68e120f 100644 --- a/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart +++ b/app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart @@ -1,7 +1,7 @@ import 'dart:ffi'; import 'package:dartz/dartz.dart'; import 'package:flowy_infra/flowy_logger.dart'; -import 'package:flowy_sdk/protobuf/ffi_response.pb.dart'; +import 'package:flowy_sdk/protobuf/dart-ffi/ffi_response.pb.dart'; import 'package:isolates/isolates.dart'; import 'package:isolates/ports.dart'; import 'package:ffi/ffi.dart'; @@ -10,7 +10,10 @@ 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.dart'; +import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart'; +import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart'; +// ignore: unused_import +import 'package:flowy_sdk/protobuf/flowy-infra/protobuf.dart'; import 'package:protobuf/protobuf.dart'; import 'error.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/dispatch/error.dart b/app_flowy/packages/flowy_sdk/lib/dispatch/error.dart index 5c2f063c82..ec1e06834b 100644 --- a/app_flowy/packages/flowy_sdk/lib/dispatch/error.dart +++ b/app_flowy/packages/flowy_sdk/lib/dispatch/error.dart @@ -1,5 +1,4 @@ -import 'package:flowy_sdk/protobuf/errors.pb.dart'; -import 'package:flowy_sdk/protobuf/ffi_response.pb.dart'; +import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart'; class FlowyError { late FFIStatusCode _statusCode; @@ -29,12 +28,6 @@ class FlowyError { factory FlowyError.from(FFIResponse resp) { return FlowyError(statusCode: resp.code, error: ""); } - - UserError userErrorFromFlowyError() { - return UserError.create() - ..code = UserErrorCode.Unknown - ..msg = this.toString(); - } } class StackTraceError { diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf.dart deleted file mode 100644 index 92cd747f05..0000000000 --- a/app_flowy/packages/flowy_sdk/lib/protobuf.dart +++ /dev/null @@ -1,10 +0,0 @@ -// Auto-generated, do not edit -export 'protobuf/kv.pb.dart'; -export 'protobuf/ffi_response.pb.dart'; -export 'protobuf/ffi_request.pb.dart'; -export 'protobuf/sign_up.pb.dart'; -export 'protobuf/sign_in.pb.dart'; -export 'protobuf/user_table.pb.dart'; -export 'protobuf/errors.pb.dart'; -export 'protobuf/user_detail.pb.dart'; -export 'protobuf/event.pb.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_request.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_request.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/ffi_response.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/ffi_response.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/protobuf.dart new file mode 100644 index 0000000000..e559425581 --- /dev/null +++ b/app_flowy/packages/flowy_sdk/lib/protobuf/dart-ffi/protobuf.dart @@ -0,0 +1,3 @@ +// Auto-generated, do not edit +export './ffi_response.pb.dart'; +export './ffi_request.pb.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/kv.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/kv.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/kv.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/kv.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/protobuf.dart new file mode 100644 index 0000000000..ccc75e7e37 --- /dev/null +++ b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-infra/protobuf.dart @@ -0,0 +1,2 @@ +// Auto-generated, do not edit +export './kv.pb.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/errors.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/errors.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/errors.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/errors.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/event.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/event.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/event.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/event.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/event.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/event.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/event.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/event.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/event.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/protobuf.dart new file mode 100644 index 0000000000..2032b9f5c2 --- /dev/null +++ b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/protobuf.dart @@ -0,0 +1,7 @@ +// Auto-generated, do not edit +export './sign_up.pb.dart'; +export './sign_in.pb.dart'; +export './user_table.pb.dart'; +export './errors.pb.dart'; +export './user_detail.pb.dart'; +export './event.pb.dart'; diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_in.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_in.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/sign_up.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/sign_up.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_detail.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_detail.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pb.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pb.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pb.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pb.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbenum.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbenum.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbenum.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbenum.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbjson.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbjson.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbjson.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbjson.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbserver.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbserver.dart similarity index 100% rename from app_flowy/packages/flowy_sdk/lib/protobuf/user_table.pbserver.dart rename to app_flowy/packages/flowy_sdk/lib/protobuf/flowy-user/user_table.pbserver.dart diff --git a/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace/protobuf.dart b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace/protobuf.dart new file mode 100644 index 0000000000..58506e3e5f --- /dev/null +++ b/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-workspace/protobuf.dart @@ -0,0 +1 @@ +// Auto-generated, do not edit diff --git a/rust-lib/Cargo.toml b/rust-lib/Cargo.toml index 477f04ecca..4085f5c52b 100644 --- a/rust-lib/Cargo.toml +++ b/rust-lib/Cargo.toml @@ -11,6 +11,7 @@ members = [ "flowy-sqlite", "flowy-database", "flowy-infra", + "flowy-workspace", ] [profile.dev] diff --git a/rust-lib/flowy-infra/src/protobuf/model/kv.rs b/rust-lib/flowy-infra/src/protobuf/model/kv.rs index cc6b4550ac..a28d4c9373 100644 --- a/rust-lib/flowy-infra/src/protobuf/model/kv.rs +++ b/rust-lib/flowy-infra/src/protobuf/model/kv.rs @@ -442,26 +442,26 @@ static file_descriptor_proto_data: &'static [u8] = b"\ _value\x18\x04\x20\x01(\x01H\x02R\nfloatValue\x12\x1f\n\nbool_value\x18\ \x05\x20\x01(\x08H\x03R\tboolValueB\x12\n\x10one_of_str_valueB\x12\n\x10\ one_of_int_valueB\x14\n\x12one_of_float_valueB\x13\n\x11one_of_bool_valu\ - eJ\xa9\x03\n\x06\x12\x04\0\0\x07\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\ - \n\x02\x04\0\x12\x04\x01\0\x07\x01\n\n\n\x03\x04\0\x01\x12\x03\x01\x08\ - \x10\n\x0b\n\x04\x04\0\x02\0\x12\x03\x02\x04\x13\n\x0c\n\x05\x04\0\x02\0\ - \x05\x12\x03\x02\x04\n\n\x0c\n\x05\x04\0\x02\0\x01\x12\x03\x02\x0b\x0e\n\ - \x0c\n\x05\x04\0\x02\0\x03\x12\x03\x02\x11\x12\n\x0b\n\x04\x04\0\x08\0\ - \x12\x03\x03\x044\n\x0c\n\x05\x04\0\x08\0\x01\x12\x03\x03\n\x1a\n\x0b\n\ - \x04\x04\0\x02\x01\x12\x03\x03\x1d2\n\x0c\n\x05\x04\0\x02\x01\x05\x12\ - \x03\x03\x1d#\n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\x03$-\n\x0c\n\x05\ - \x04\0\x02\x01\x03\x12\x03\x0301\n\x0b\n\x04\x04\0\x08\x01\x12\x03\x04\ - \x043\n\x0c\n\x05\x04\0\x08\x01\x01\x12\x03\x04\n\x1a\n\x0b\n\x04\x04\0\ - \x02\x02\x12\x03\x04\x1d1\n\x0c\n\x05\x04\0\x02\x02\x05\x12\x03\x04\x1d\ - \"\n\x0c\n\x05\x04\0\x02\x02\x01\x12\x03\x04#,\n\x0c\n\x05\x04\0\x02\x02\ - \x03\x12\x03\x04/0\n\x0b\n\x04\x04\0\x08\x02\x12\x03\x05\x048\n\x0c\n\ - \x05\x04\0\x08\x02\x01\x12\x03\x05\n\x1c\n\x0b\n\x04\x04\0\x02\x03\x12\ - \x03\x05\x1f6\n\x0c\n\x05\x04\0\x02\x03\x05\x12\x03\x05\x1f%\n\x0c\n\x05\ - \x04\0\x02\x03\x01\x12\x03\x05&1\n\x0c\n\x05\x04\0\x02\x03\x03\x12\x03\ - \x0545\n\x0b\n\x04\x04\0\x08\x03\x12\x03\x06\x044\n\x0c\n\x05\x04\0\x08\ - \x03\x01\x12\x03\x06\n\x1b\n\x0b\n\x04\x04\0\x02\x04\x12\x03\x06\x1e2\n\ - \x0c\n\x05\x04\0\x02\x04\x05\x12\x03\x06\x1e\"\n\x0c\n\x05\x04\0\x02\x04\ - \x01\x12\x03\x06#-\n\x0c\n\x05\x04\0\x02\x04\x03\x12\x03\x0601b\x06proto\ + eJ\xa9\x03\n\x06\x12\x04\0\0\x08\x01\n\x08\n\x01\x0c\x12\x03\0\0\x12\n\n\ + \n\x02\x04\0\x12\x04\x02\0\x08\x01\n\n\n\x03\x04\0\x01\x12\x03\x02\x08\ + \x10\n\x0b\n\x04\x04\0\x02\0\x12\x03\x03\x04\x13\n\x0c\n\x05\x04\0\x02\0\ + \x05\x12\x03\x03\x04\n\n\x0c\n\x05\x04\0\x02\0\x01\x12\x03\x03\x0b\x0e\n\ + \x0c\n\x05\x04\0\x02\0\x03\x12\x03\x03\x11\x12\n\x0b\n\x04\x04\0\x08\0\ + \x12\x03\x04\x044\n\x0c\n\x05\x04\0\x08\0\x01\x12\x03\x04\n\x1a\n\x0b\n\ + \x04\x04\0\x02\x01\x12\x03\x04\x1d2\n\x0c\n\x05\x04\0\x02\x01\x05\x12\ + \x03\x04\x1d#\n\x0c\n\x05\x04\0\x02\x01\x01\x12\x03\x04$-\n\x0c\n\x05\ + \x04\0\x02\x01\x03\x12\x03\x0401\n\x0b\n\x04\x04\0\x08\x01\x12\x03\x05\ + \x043\n\x0c\n\x05\x04\0\x08\x01\x01\x12\x03\x05\n\x1a\n\x0b\n\x04\x04\0\ + \x02\x02\x12\x03\x05\x1d1\n\x0c\n\x05\x04\0\x02\x02\x05\x12\x03\x05\x1d\ + \"\n\x0c\n\x05\x04\0\x02\x02\x01\x12\x03\x05#,\n\x0c\n\x05\x04\0\x02\x02\ + \x03\x12\x03\x05/0\n\x0b\n\x04\x04\0\x08\x02\x12\x03\x06\x048\n\x0c\n\ + \x05\x04\0\x08\x02\x01\x12\x03\x06\n\x1c\n\x0b\n\x04\x04\0\x02\x03\x12\ + \x03\x06\x1f6\n\x0c\n\x05\x04\0\x02\x03\x05\x12\x03\x06\x1f%\n\x0c\n\x05\ + \x04\0\x02\x03\x01\x12\x03\x06&1\n\x0c\n\x05\x04\0\x02\x03\x03\x12\x03\ + \x0645\n\x0b\n\x04\x04\0\x08\x03\x12\x03\x07\x044\n\x0c\n\x05\x04\0\x08\ + \x03\x01\x12\x03\x07\n\x1b\n\x0b\n\x04\x04\0\x02\x04\x12\x03\x07\x1e2\n\ + \x0c\n\x05\x04\0\x02\x04\x05\x12\x03\x07\x1e\"\n\x0c\n\x05\x04\0\x02\x04\ + \x01\x12\x03\x07#-\n\x0c\n\x05\x04\0\x02\x04\x03\x12\x03\x0701b\x06proto\ 3\ "; diff --git a/rust-lib/flowy-infra/src/protobuf/proto/kv.proto b/rust-lib/flowy-infra/src/protobuf/proto/kv.proto index 06828a3f6f..0644b43adc 100644 --- a/rust-lib/flowy-infra/src/protobuf/proto/kv.proto +++ b/rust-lib/flowy-infra/src/protobuf/proto/kv.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + message KeyValue { string key = 1; oneof one_of_str_value { string str_value = 2; }; diff --git a/rust-lib/flowy-workspace/Cargo.toml b/rust-lib/flowy-workspace/Cargo.toml new file mode 100644 index 0000000000..bd9c8bbbc9 --- /dev/null +++ b/rust-lib/flowy-workspace/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "flowy-workspace" +version = "0.1.0" +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +flowy-dispatch = { path = "../flowy-dispatch" } +flowy-log = { path = "../flowy-log" } +flowy-derive = { path = "../flowy-derive" } +flowy-database = { path = "../flowy-database" } +flowy-sqlite = { path = "../flowy-sqlite" } +flowy-infra = { path = "../flowy-infra" } + +protobuf = {version = "2.18.0"} +diesel = {version = "1.4.7", features = ["sqlite"]} +diesel_derives = {version = "1.4.1", features = ["sqlite"]} +lazy_static = "1.4.0" \ No newline at end of file diff --git a/rust-lib/flowy-workspace/Flowy.toml b/rust-lib/flowy-workspace/Flowy.toml new file mode 100644 index 0000000000..7f8a3d3901 --- /dev/null +++ b/rust-lib/flowy-workspace/Flowy.toml @@ -0,0 +1,6 @@ + +#proto_crates = ["src/entities", "src/event.rs", "src/errors.rs"] +#event_files = ["src/event.rs"] + +proto_crates = [] +event_files = [] \ No newline at end of file diff --git a/rust-lib/flowy-workspace/src/entities/mod.rs b/rust-lib/flowy-workspace/src/entities/mod.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rust-lib/flowy-workspace/src/errors.rs b/rust-lib/flowy-workspace/src/errors.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rust-lib/flowy-workspace/src/event.rs b/rust-lib/flowy-workspace/src/event.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rust-lib/flowy-workspace/src/lib.rs b/rust-lib/flowy-workspace/src/lib.rs new file mode 100644 index 0000000000..4a0895aea1 --- /dev/null +++ b/rust-lib/flowy-workspace/src/lib.rs @@ -0,0 +1,5 @@ +pub mod entities; +pub mod errors; +pub mod event; +pub mod module; +mod sql_tables; diff --git a/rust-lib/flowy-workspace/src/module.rs b/rust-lib/flowy-workspace/src/module.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rust-lib/flowy-workspace/src/protobuf/mod.rs b/rust-lib/flowy-workspace/src/protobuf/mod.rs new file mode 100644 index 0000000000..2480f62fbe --- /dev/null +++ b/rust-lib/flowy-workspace/src/protobuf/mod.rs @@ -0,0 +1,4 @@ + +mod model; +pub use model::*; + \ No newline at end of file diff --git a/rust-lib/flowy-workspace/src/protobuf/model/mod.rs b/rust-lib/flowy-workspace/src/protobuf/model/mod.rs new file mode 100644 index 0000000000..58506e3e5f --- /dev/null +++ b/rust-lib/flowy-workspace/src/protobuf/model/mod.rs @@ -0,0 +1 @@ +// Auto-generated, do not edit diff --git a/rust-lib/flowy-workspace/src/sql_tables/mod.rs b/rust-lib/flowy-workspace/src/sql_tables/mod.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/flowy-tool/src/proto/proto_gen.rs b/scripts/flowy-tool/src/proto/proto_gen.rs index bb8a0f6c0b..818d44020b 100644 --- a/scripts/flowy-tool/src/proto/proto_gen.rs +++ b/scripts/flowy-tool/src/proto/proto_gen.rs @@ -30,7 +30,6 @@ impl ProtoGen { fn write_proto_files(crate_infos: &Vec) { for crate_info in crate_infos { let dir = crate_info.inner.proto_file_output_dir(); - remove_everything_in_dir(dir.as_str()); crate_info.files.iter().for_each(|info| { let proto_file_path = format!("{}/{}.proto", dir, &info.file_name); save_content_to_file_with_diff_prompt( @@ -76,36 +75,35 @@ fn write_flutter_protobuf_package_mod_file( crate_infos: &Vec, package_info: &FlutterProtobufInfo, ) { - let mod_path = package_info.mod_file_path(); - let _model_dir = package_info.model_dir(); - match OpenOptions::new() - .create(true) - .write(true) - .append(false) - .truncate(true) - .open(&mod_path) - { - Ok(ref mut file) => { - let mut mod_file_content = String::new(); - mod_file_content.push_str("// Auto-generated, do not edit \n"); + let model_dir = package_info.model_dir(); + for crate_info in crate_infos { + let mod_path = crate_info.flutter_mod_file(model_dir.as_str()); + match OpenOptions::new() + .create(true) + .write(true) + .append(false) + .truncate(true) + .open(&mod_path) + { + Ok(ref mut file) => { + let mut mod_file_content = String::new(); + mod_file_content.push_str("// Auto-generated, do not edit \n"); - for crate_info in crate_infos { - let _mod_path = crate_info.inner.proto_model_mod_file(); walk_dir( crate_info.inner.proto_file_output_dir().as_ref(), |e| e.file_type().is_dir() == false, |_, name| { - let c = format!("export 'protobuf/{}.pb.dart';\n", &name); + let c = format!("export './{}.pb.dart';\n", &name); mod_file_content.push_str(c.as_ref()); }, ); - } - file.write_all(mod_file_content.as_bytes()).unwrap(); - file.flush().unwrap(); - } - Err(err) => { - panic!("Failed to open file: {}", err); + file.write_all(mod_file_content.as_bytes()).unwrap(); + file.flush().unwrap(); + } + Err(err) => { + panic!("Failed to open file: {}", err); + } } } } @@ -134,17 +132,21 @@ fn run_rust_protoc(crate_infos: &Vec) { fn run_flutter_protoc(crate_infos: &Vec, package_info: &FlutterProtobufInfo) { let model_dir = package_info.model_dir(); - let removed_dir = format!("{}/", model_dir); - remove_everything_in_dir(removed_dir.as_str()); + if !Path::new(&model_dir).exists() { + std::fs::create_dir_all(&model_dir).unwrap(); + } for crate_info in crate_infos { let proto_path = crate_info.inner.proto_file_output_dir(); + let crate_module_dir = crate_info.flutter_mod_dir(model_dir.as_str()); + remove_everything_in_dir(crate_module_dir.as_str()); + walk_dir( proto_path.as_ref(), |e| is_proto_file(e), |proto_file, _| { if cmd_lib::run_cmd! { - protoc --dart_out=${model_dir} --proto_path=${proto_path} ${proto_file} + protoc --dart_out=${crate_module_dir} --proto_path=${proto_path} ${proto_file} } .is_err() { @@ -156,16 +158,14 @@ fn run_flutter_protoc(crate_infos: &Vec, package_info: &FlutterP } fn remove_everything_in_dir(dir: &str) { - if !Path::new(dir).exists() { + if Path::new(dir).exists() { if cmd_lib::run_cmd! { rm -rf ${dir} - mkdir ${dir} } .is_err() { panic!("Reset protobuf directory failed") }; - } else { - std::fs::create_dir_all(dir).unwrap(); } + std::fs::create_dir_all(dir).unwrap(); } diff --git a/scripts/flowy-tool/src/proto/proto_info.rs b/scripts/flowy-tool/src/proto/proto_info.rs index c324efab56..a05f385c9a 100644 --- a/scripts/flowy-tool/src/proto/proto_info.rs +++ b/scripts/flowy-tool/src/proto/proto_info.rs @@ -36,6 +36,16 @@ pub use model::*; } } } + + pub fn flutter_mod_dir(&self, root: &str) -> String { + let crate_module_dir = format!("{}/{}", root, self.inner.folder_name); + crate_module_dir + } + + pub fn flutter_mod_file(&self, root: &str) -> String { + let crate_module_dir = format!("{}/{}/protobuf.dart", root, self.inner.folder_name); + crate_module_dir + } } #[derive(Clone, Debug)] diff --git a/scripts/flowy-tool/src/util/file.rs b/scripts/flowy-tool/src/util/file.rs index 48befc2990..1719631560 100644 --- a/scripts/flowy-tool/src/util/file.rs +++ b/scripts/flowy-tool/src/util/file.rs @@ -59,7 +59,7 @@ pub fn save_content_to_file_with_diff_prompt(content: &str, output_file: &str, _ .open(output_file) { Ok(ref mut file) => file.write_all(content.as_bytes()).unwrap(), - Err(err) => panic!("Open or create file fail: {}", err), + Err(err) => panic!("Open or create to {} fail: {}", output_file, err), } } }