refactor

Author: hoc081098

.idea/libraries/Dart_Packages.xml

@@ -9,7 +9,6 @@ import '../logger/logger.dart';
 import '../model/key_and_value.dart';
 import '../stream_extensions/map_not_null_stream_transformer.dart';
 import '../stream_extensions/single_subscription.dart';
-import '../synchronous_future.dart';
 
 /// Default [RxStorage] implementation
 class RealRxStorage implements RxStorage {
@@ -98,13 +97,13 @@ class RealRxStorage implements RxStorage {
     String key,
     T value,
   ) {
+    assert(key != null);
+
     if (T == dynamic) {
       assert(value == null);
       return storage.remove(key);
     }
 
-    assert(key != null);
-
     // TODO(40014): Remove cast when type promotion works.
     // This would normally be `as T` but we use `as dynamic` to make the
     // unneeded check be implicit to match dart2js unsound optimizations in the
@@ -137,9 +136,8 @@ class RealRxStorage implements RxStorage {
         .mapNotNull(
             (map) => map.containsKey(key) ? KeyAndValue(key, map[key]) : null)
         .startWith(null) // Dummy value to trigger initial load.
-        .asyncMap<T>((entry) => entry == null
-            ? _getValue<T>(key)
-            : SynchronousFuture(entry.value as T));
+        .asyncMap<T>(
+            (entry) => entry == null ? _getValue<T>(key) : entry.value as T);
 
     if (_logger == null) {
       return stream;

.idea/libraries/Dart_SDK.xml

@@ -1,5 +1,6 @@
 import 'package:rx_storage/src/interface/storage.dart';
-import 'package:rx_storage/src/synchronous_future.dart';
+
+import 'utils/synchronous_future.dart';
 
 Future<T> _wrap<T>(T value) => SynchronousFuture(value);
 

.idea/vcs.xml

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:rx_storage/rx_storage.dart';
 
 import 'fake_storage.dart';
@@ -39,6 +41,26 @@ void main() async {
   stopwatch.stop();
   print(stopwatch.elapsedMilliseconds);
 
+  final completer = Completer<void>.sync();
+  stopwatch
+    ..reset()
+    ..start();
+  print('Start 2...');
+  rxStorage.getStringStream('key').listen((event) {
+    if (event == 10000.toString()) {
+      print('End 2...');
+
+      stopwatch.stop();
+      print(stopwatch.elapsedMilliseconds);
+      completer.complete();
+    }
+  });
+  for (var i = 0; i <= 10000; i++) {
+    await rxStorage.setString('key', i.toString());
+  }
+
+  await completer.future;
+
   /*for (var i = 0; i < 10000; i++) {
       await Future.value(1)
           .then((value) => SynchronousFuture(value + 1))