rename flowy-observable to flowy-dart-notify

app_flowy/lib/workspace/infrastructure/i_user_impl.dart

@@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
 import 'package:dartz/dartz.dart';
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
-import 'package:flowy_sdk/protobuf/flowy-observable/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error;
 import 'package:flowy_sdk/protobuf/flowy-user/observable.pb.dart' as user;
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';

app_flowy/lib/workspace/infrastructure/repos/app_repo.dart

@@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/domain/i_app.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/app_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';

app_flowy/lib/workspace/infrastructure/repos/helper.dart

@@ -1,5 +1,5 @@
 import 'dart:typed_data';
-import 'package:flowy_sdk/protobuf/flowy-observable/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';

app_flowy/lib/workspace/infrastructure/repos/view_repo.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';

app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
-import 'package:flowy_sdk/protobuf/flowy-observable/subject.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';

app_flowy/packages/flowy_sdk/lib/rust_stream.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ffi';
 import 'package:flowy_log/flowy_log.dart';
-import 'protobuf/flowy-observable/subject.pb.dart';
+import 'protobuf/flowy-dart-notify/subject.pb.dart';
 
 typedef ObserverCallback = void Function(ObservableSubject observable);
 

rust-lib/Cargo.toml

@@ -12,7 +12,7 @@ members = [
   "flowy-database",
   "flowy-infra",
   "flowy-workspace",
-  "flowy-observable",
+  "flowy-dart-notify",
   "flowy-document",
   "flowy-ot",
   "flowy-net",

rust-lib/dart-ffi/Cargo.toml

@@ -30,12 +30,12 @@ parking_lot = "0.11"
 flowy-dispatch = {path = "../flowy-dispatch"}
 flowy-sdk = {path = "../flowy-sdk"}
 flowy-derive = {path = "../flowy-derive"}
-flowy-observable = {path = "../flowy-observable"}
+flowy-dart-notify = {path = "../flowy-dart-notify" }
 flowy-net = {path = "../flowy-net"}
 
 
 [features]
-observable = ["flowy-observable/dart"]
+observable = ["flowy-dart-notify/dart"]
 http_server = ["flowy-sdk/http_server", "flowy-sdk/use_bunyan"]
 #use_serde = ["bincode"]
 #use_protobuf= ["protobuf"]

rust-lib/dart-ffi/src/lib.rs

@@ -61,7 +61,7 @@ pub extern "C" fn sync_command(input: *const u8, len: usize) -> *const u8 {
 
 #[no_mangle]
 pub extern "C" fn set_stream_port(port: i64) -> i32 {
-    flowy_observable::dart::DartStreamSender::set_port(port);
+    flowy_dart_notify::dart::DartStreamSender::set_port(port);
     return 0;
 }
 

rust-lib/flowy-dart-notify/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "flowy-observable"
+name = "flowy-dart-notify"
 version = "0.1.0"
 edition = "2018"
 

rust-lib/flowy-derive/src/derive_cache/derive_cache.rs

@@ -15,8 +15,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         "HashMap" => TypeCategory::Map,
         "u8" => TypeCategory::Bytes,
         "String" => TypeCategory::Str,
-        "ObservableSubject"
+        "KeyValue"
-        | "KeyValue"
         | "QueryAppRequest"
         | "QueryAppParams"
         | "CreateAppRequest"
@@ -66,6 +65,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "DocError"
         | "FFIRequest"
         | "FFIResponse"
+        | "ObservableSubject"
         | "SignInRequest"
         | "SignInParams"
         | "SignInResponse"

rust-lib/flowy-document/Cargo.toml

@@ -12,7 +12,7 @@ flowy-dispatch = { path = "../flowy-dispatch" }
 flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
 flowy-infra = { path = "../flowy-infra" }
-flowy-observable = { path = "../flowy-observable" }
+flowy-dart-notify = { path = "../flowy-dart-notify" }
 flowy-ot = { path = "../flowy-ot" }
 flowy-ws = { path = "../flowy-ws" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }

rust-lib/flowy-document/src/notify/observable.rs

@@ -1,5 +1,5 @@
+use flowy_dart_notify::DartNotifyBuilder;
 use flowy_derive::ProtoBuf_Enum;
-use flowy_observable::DartNotifyBuilder;
 const OBSERVABLE_CATEGORY: &'static str = "Doc";
 #[derive(ProtoBuf_Enum, Debug)]
 pub(crate) enum DocObservable {

rust-lib/flowy-sdk/src/lib.rs

@@ -44,7 +44,7 @@ fn crate_log_filter(level: Option<String>) -> String {
     filters.push(format!("flowy_workspace={}", level));
     filters.push(format!("flowy_user={}", level));
     filters.push(format!("flowy_document={}", level));
-    filters.push(format!("flowy_observable={}", level));
+    filters.push(format!("flowy_dart_notify={}", level));
     filters.push(format!("flowy_ot={}", level));
     filters.push(format!("flowy_ws={}", level));
     filters.push(format!("info"));

rust-lib/flowy-user/Cargo.toml

@@ -14,7 +14,7 @@ flowy-sqlite = { path = "../flowy-sqlite" }
 flowy-infra = { path = "../flowy-infra" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }
 flowy-ws = { path = "../flowy-ws"}
-flowy-observable = { path = "../flowy-observable" }
+flowy-dart-notify = { path = "../flowy-dart-notify" }
 
 tracing = { version = "0.1", features = ["log"] }
 bytes = "1.0"

rust-lib/flowy-user/src/notify/observable.rs

@@ -1,6 +1,6 @@
 use flowy_derive::ProtoBuf_Enum;
 
-use flowy_observable::DartNotifyBuilder;
+use flowy_dart_notify::DartNotifyBuilder;
 
 const OBSERVABLE_CATEGORY: &'static str = "User";
 

rust-lib/flowy-workspace/Cargo.toml

@@ -11,7 +11,7 @@ flowy-derive = { path = "../flowy-derive" }
 flowy-database = { path = "../flowy-database" }
 flowy-sqlite = { path = "../flowy-sqlite" }
 flowy-infra = { path = "../flowy-infra" }
-flowy-observable = { path = "../flowy-observable" }
+flowy-dart-notify = { path = "../flowy-dart-notify" }
 flowy-document = { path = "../flowy-document" }
 flowy-ot = { path = "../flowy-ot" }
 flowy-net = { path = "../flowy-net", features = ["flowy_request"] }

rust-lib/flowy-workspace/src/notify/observable.rs

@@ -1,5 +1,5 @@
+use flowy_dart_notify::DartNotifyBuilder;
 use flowy_derive::ProtoBuf_Enum;
-use flowy_observable::DartNotifyBuilder;
 const OBSERVABLE_CATEGORY: &'static str = "Workspace";
 
 #[derive(ProtoBuf_Enum, Debug)]