2.4.0 (#15)

* deps

* fix

* 2.4.0

* 2.4.0

Author: hoc081098

.github/workflows/dart.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: google/dart:2.12
+      image: google/dart:latest
 
     steps:
       - uses: actions/checkout@v2
@@ -24,7 +24,7 @@ jobs:
         run: dart analyze --fatal-infos --fatal-warnings
 
       - name: Format code
-        run: dartfmt -n ./lib ./test --set-exit-if-changed
+        run: dart format . --set-exit-if-changed
 
       - name: Active coverage
         run: pub global activate coverage
@@ -41,4 +41,4 @@ jobs:
       - name: Format coverage
         run: pub global run coverage:format_coverage --lcov --in=coverage.json --out=lcov.info --packages=.packages --report-on=lib
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2.1.0

AUTHORS

@@ -0,0 +1 @@
+Petrus Nguyễn Thái Học <[email protected]>

analysis_options.yaml

@@ -1,11 +1,17 @@
-include: package:pedantic/analysis_options.1.11.0.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
     implicit-casts: false
     implicit-dynamic: false
+
 linter:
   rules:
     - prefer_final_locals
     - public_member_api_docs
     - prefer_relative_imports
+    # https://github.com/dart-lang/lints#migrating-from-packagepedantic
+    - always_declare_return_types
+    - prefer_single_quotes
+    - unawaited_futures
+    - unsafe_html

example/selector.dart

@@ -1,8 +1,8 @@
 import 'package:built_collection/built_collection.dart';
 import 'package:disposebag/disposebag.dart';
-import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
 import 'package:pedantic/pedantic.dart';
 import 'package:rx_redux/rx_redux.dart';
+import 'package:rxdart_ext/state_stream.dart';
 
 //
 // [BEGIN] STATE
@@ -147,7 +147,7 @@ void main() async {
       reducer: reducer);
 
   // select 2 pieces of state and combine them.
-  final visibleBooks$ = store.select2(
+  final select2$ = store.select2(
     (s) => s.selectedUser?.id,
     (s) => s.allBooks,
     (String? userId, BuiltList<Book> books) {
@@ -157,7 +157,9 @@ void main() async {
           ? books.where((b) => b.userId == userId).toBuiltList()
           : books;
     },
-  ).asBroadcastDistinctValueStream();
+  );
+  final visibleBooks$ = select2$
+      .shareState(select2$.value); // TODO: remove select2$ and shareState
 
   // logging state.
   print('~> ${visibleBooks$.value}');

example/todo.dart

@@ -73,6 +73,7 @@ ViewState reducer(ViewState vs, Action action) {
 
 /// Side effects
 
+// ignore: prefer_function_declarations_over_variables
 final SideEffect<Action, ViewState> addTodoEffect = (action$, state) => action$
     .where((event) => event.type == ActionType.add)
     .map((event) => event.todo)
@@ -87,28 +88,31 @@ Stream<Action> removeTodoEffect(
   Stream<Action> action$,
   GetState<ViewState> state,
 ) {
-  final executeRemove = (Todo todo) async* {
+  Stream<Action> executeRemove(Todo todo) async* {
     await Future<void>.delayed(const Duration(milliseconds: 200));
     yield Action(todo, ActionType.removed);
-  };
+  }
+
   return action$
       .where((event) => event.type == ActionType.remove)
       .map((action) => action.todo)
       .flatMap(executeRemove);
 }
 
+// ignore: prefer_function_declarations_over_variables
 final SideEffect<Action, ViewState> toggleTodoEffect = (action$, state) {
-  final executeToggle = (Todo todo) async* {
+  Stream<Action> executeToggle(Todo todo) async* {
     await Future<void>.delayed(const Duration(milliseconds: 500));
     yield Action(todo, ActionType.toggled);
-  };
+  }
+
   return action$
       .where((event) => event.type == ActionType.toggle)
       .map((action) => action.todo)
       .flatMap(executeToggle);
 };
 
-final delay = () => Future<void>.delayed(const Duration(seconds: 1));
+Future<void> delay() => Future<void>.delayed(const Duration(seconds: 1));
 
 void main() async {
   final store = RxReduxStore(

lib/src/redux_store_stream_transformer.dart

@@ -161,7 +161,7 @@ class ReduxStoreStreamTransformer<A, S> extends StreamTransformerBase<A, S> {
                 onDone: controller.close,
               );
 
-      final getState = () => state;
+      S getState() => state;
       final actionStream = actionController.stream
           .map((wrapper) => wrapper.action<A>())
           .asBroadcastStream(onCancel: (s) => s.cancel());
@@ -195,7 +195,9 @@ class ReduxStoreStreamTransformer<A, S> extends StreamTransformerBase<A, S> {
       controller = StreamController<S>(
         sync: true,
         onListen: onListen,
+        // ignore: avoid_function_literals_in_foreach_calls
         onPause: () => subscriptions?.forEach((s) => s.pause()),
+        // ignore: avoid_function_literals_in_foreach_calls
         onResume: () => subscriptions?.forEach((s) => s.resume()),
         onCancel: onCancel,
       );

lib/src/selectors.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
+import 'package:rxdart_ext/state_stream.dart';
 
 import 'store.dart';
 
@@ -30,16 +30,16 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Observe a value of type [Result] exposed from a state stream, and listen only partially to changes.
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select<Result>(
+  StateStream<Result> select<Result>(
     Selector<State, Result> selector, {
     Equals<Result>? equals,
   }) =>
-      stateStream.map(selector).distinctValue(selector(state), equals: equals);
+      stateStream.map(selector).toStateStream(selector(state), equals: equals);
 
   /// Select two sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select2<SubState1, SubState2, Result>(
+  StateStream<Result> select2<SubState1, SubState2, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Result Function(SubState1 subState1, SubState2 subState2) projector, {
@@ -60,7 +60,7 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select three sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select3<SubState1, SubState2, SubState3, Result>(
+  StateStream<Result> select3<SubState1, SubState2, SubState3, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Selector<State, SubState3> selector3,
@@ -87,7 +87,7 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select four sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result>
+  StateStream<Result>
       select4<SubState1, SubState2, SubState3, SubState4, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
@@ -123,7 +123,7 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select five sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result>
+  StateStream<Result>
       select5<SubState1, SubState2, SubState3, SubState4, SubState5, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
@@ -173,8 +173,8 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select five sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select6<SubState1, SubState2, SubState3,
-      SubState4, SubState5, SubState6, Result>(
+  StateStream<Result> select6<SubState1, SubState2, SubState3, SubState4,
+      SubState5, SubState6, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Selector<State, SubState3> selector3,
@@ -229,8 +229,8 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select seven sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select7<SubState1, SubState2, SubState3,
-      SubState4, SubState5, SubState6, SubState7, Result>(
+  StateStream<Result> select7<SubState1, SubState2, SubState3, SubState4,
+      SubState5, SubState6, SubState7, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Selector<State, SubState3> selector3,
@@ -291,8 +291,8 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select eight sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select8<SubState1, SubState2, SubState3,
-      SubState4, SubState5, SubState6, SubState7, SubState8, Result>(
+  StateStream<Result> select8<SubState1, SubState2, SubState3, SubState4,
+      SubState5, SubState6, SubState7, SubState8, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Selector<State, SubState3> selector3,
@@ -359,8 +359,8 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select nine sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> select9<SubState1, SubState2, SubState3,
-      SubState4, SubState5, SubState6, SubState7, SubState8, SubState9, Result>(
+  StateStream<Result> select9<SubState1, SubState2, SubState3, SubState4,
+      SubState5, SubState6, SubState7, SubState8, SubState9, Result>(
     Selector<State, SubState1> selector1,
     Selector<State, SubState2> selector2,
     Selector<State, SubState3> selector3,
@@ -433,7 +433,7 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
   /// Select many sub states and combine them by [projector].
   ///
   /// The returned Stream is a single-subscription Stream.
-  DistinctValueStream<Result> selectMany<SubState, Result>(
+  StateStream<Result> selectMany<SubState, Result>(
     List<Selector<State, SubState>> selectors,
     List<Equals<SubState>?> subStateEquals,
     Result Function(List<SubState> subStates) projector, {
@@ -499,24 +499,24 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
       );
     }
 
-    final selectSubStates =
-        (State state) => selectors.map((s) => s(state)).toList(growable: false);
+    List<SubState> selectSubStates(State state) =>
+        selectors.map((s) => s(state)).toList(growable: false);
 
     final eqs = subStateEquals
-        .map((e) => e ?? DistinctValueStream.defaultEquals)
+        .map((e) => e ?? StateStream.defaultEquals)
         .toList(growable: false);
 
     late final indices = Iterable<int>.generate(length);
-    final subStatesEquals = (List<SubState> previous, List<SubState> next) =>
+    bool subStatesEquals(List<SubState> previous, List<SubState> next) =>
         indices.every((i) => eqs[i](previous[i], next[i]));
 
     final currentSubStates = selectSubStates(state);
 
     return stateStream
         .map(selectSubStates)
-        .distinctValue(currentSubStates, equals: subStatesEquals)
+        .toStateStream(currentSubStates, equals: subStatesEquals)
         .map(projector)
-        .distinctValue(projector(currentSubStates), equals: equals);
+        .toStateStream(projector(currentSubStates), equals: equals);
   }
 }
 
@@ -532,18 +532,17 @@ extension SelectorsExtension<Action, State> on RxReduxStore<Action, State> {
 Equals<Object?>? _castToDynamicParams<T>(Equals<T>? f) =>
     f == null ? null : (Object? l, Object? r) => f(l as T, r as T);
 
-DistinctValueStream<Result>
-    _select2Internal<State, SubState1, SubState2, Result>(
-  DistinctValueStream<State> stateStream,
+StateStream<Result> _select2Internal<State, SubState1, SubState2, Result>(
+  StateStream<State> stateStream,
   Selector<State, SubState1> selector1,
   Selector<State, SubState2> selector2,
   Result Function(SubState1 subState1, SubState2 subState2) projector,
   Equals<SubState1>? equals1,
   Equals<SubState2>? equals2,
   Equals<Result>? equals,
 ) {
-  final eq1 = equals1 ?? DistinctValueStream.defaultEquals;
-  final eq2 = equals2 ?? DistinctValueStream.defaultEquals;
+  final eq1 = equals1 ?? StateStream.defaultEquals;
+  final eq2 = equals2 ?? StateStream.defaultEquals;
 
   final controller = StreamController<Result>(sync: true);
   StreamSubscription<State>? subscription;
@@ -577,12 +576,12 @@ DistinctValueStream<Result>
     return toCancel?.cancel();
   };
 
-  return controller.stream.distinctValue(initialResult, equals: equals);
+  return controller.stream.toStateStream(initialResult, equals: equals);
 }
 
-DistinctValueStream<Result>
+StateStream<Result>
     _select3Internal<State, SubState1, SubState2, SubState3, Result>(
-  DistinctValueStream<State> stateStream,
+  StateStream<State> stateStream,
   Selector<State, SubState1> selector1,
   Selector<State, SubState2> selector2,
   Selector<State, SubState3> selector3,
@@ -593,9 +592,9 @@ DistinctValueStream<Result>
   Equals<SubState3>? equals3,
   Equals<Result>? equals,
 ) {
-  final eq1 = equals1 ?? DistinctValueStream.defaultEquals;
-  final eq2 = equals2 ?? DistinctValueStream.defaultEquals;
-  final eq3 = equals3 ?? DistinctValueStream.defaultEquals;
+  final eq1 = equals1 ?? StateStream.defaultEquals;
+  final eq2 = equals2 ?? StateStream.defaultEquals;
+  final eq3 = equals3 ?? StateStream.defaultEquals;
 
   final controller = StreamController<Result>(sync: true);
   StreamSubscription<State>? subscription;
@@ -634,12 +633,12 @@ DistinctValueStream<Result>
     return toCancel?.cancel();
   };
 
-  return controller.stream.distinctValue(initialResult, equals: equals);
+  return controller.stream.toStateStream(initialResult, equals: equals);
 }
 
-DistinctValueStream<Result>
+StateStream<Result>
     _select4Internal<State, SubState1, SubState2, SubState3, SubState4, Result>(
-  DistinctValueStream<State> stateStream,
+  StateStream<State> stateStream,
   Selector<State, SubState1> selector1,
   Selector<State, SubState2> selector2,
   Selector<State, SubState3> selector3,
@@ -657,10 +656,10 @@ DistinctValueStream<Result>
   Equals<SubState4>? equals4,
   Equals<Result>? equals,
 ) {
-  final eq1 = equals1 ?? DistinctValueStream.defaultEquals;
-  final eq2 = equals2 ?? DistinctValueStream.defaultEquals;
-  final eq3 = equals3 ?? DistinctValueStream.defaultEquals;
-  final eq4 = equals4 ?? DistinctValueStream.defaultEquals;
+  final eq1 = equals1 ?? StateStream.defaultEquals;
+  final eq2 = equals2 ?? StateStream.defaultEquals;
+  final eq3 = equals3 ?? StateStream.defaultEquals;
+  final eq4 = equals4 ?? StateStream.defaultEquals;
 
   final controller = StreamController<Result>(sync: true);
   StreamSubscription<State>? subscription;
@@ -703,5 +702,5 @@ DistinctValueStream<Result>
     return toCancel?.cancel();
   };
 
-  return controller.stream.distinctValue(initialResult, equals: equals);
+  return controller.stream.toStateStream(initialResult, equals: equals);
 }