Merge pull request #14 from davidmarne/2.0.0

2.0.0

Author: davidmarne

.travis.yml

@@ -1,10 +1,10 @@
 language: dart
 dart:
-  - 1.22.1
+  - 1.24.2
 script:
+  - dart tool/build.dart
   - pub run dart_dev format --check
   - pub run dart_dev analyze
-  - dart tool/build.dart
   - pub run dart_dev test
   - pub run dart_dev coverage --no-html
   - bash <(curl -s https://codecov.io/bash) -f coverage/coverage.lcov

analysis_options.yaml

@@ -0,0 +1,2 @@
+analyzer:
+  strong-mode: true

lib/src/middleware.dart

@@ -25,23 +25,24 @@ class MiddlewareApi<State extends BuiltReducer<State, StateBuilder>,
 /// Action<T>, and a builder of type StateBuilder
 class MiddlewareBuilder<State extends BuiltReducer<State, StateBuilder>,
     StateBuilder extends Builder<State, StateBuilder>, Actions extends ReduxActions> {
-  var _map = new Map<String, MiddlewareHandler<State, StateBuilder, Actions>>();
+  var _map = new Map<String, MiddlewareHandler<State, StateBuilder, Actions, dynamic>>();
 
-  void add<T>(ActionName<T> aMgr, MiddlewareHandler<State, StateBuilder, Actions> handler) {
+  void add<T>(ActionName<T> aMgr, MiddlewareHandler<State, StateBuilder, Actions, T> handler) {
     _map[aMgr.name] = handler;
   }
 
   /// build returns a [Middleware] function that handles all actions added with [add]
   Middleware<State, StateBuilder, Actions> build() =>
-      (MiddlewareApi<State, StateBuilder, Actions> api) => (ActionHandler next) => (Action action) {
-            var handler = _map[action.name];
-            if (handler != null) {
-              handler(api, next, action);
-              return;
-            }
-
-            next(action);
-          };
+      (MiddlewareApi<State, StateBuilder, Actions> api) =>
+          (ActionHandler next) => (Action<dynamic> action) {
+                var handler = _map[action.name];
+                if (handler != null) {
+                  handler(api, next, action);
+                  return;
+                }
+
+                next(action);
+              };
 }
 
 /// [MiddlewareHandler] is a function that handles an action in a middleware. Its is only for
@@ -50,4 +51,5 @@ class MiddlewareBuilder<State extends BuiltReducer<State, StateBuilder>,
 typedef void MiddlewareHandler<
     State extends BuiltReducer<State, StateBuilder>,
     StateBuilder extends Builder<State, StateBuilder>,
-    Actions extends ReduxActions>(MiddlewareApi<State, StateBuilder, Actions> api, ActionHandler next, Action action);
+    Actions extends ReduxActions,
+    Payload>(MiddlewareApi<State, StateBuilder, Actions> api, ActionHandler next, Action<Payload> action);

lib/src/store.dart

@@ -14,7 +14,7 @@ import 'store_change.dart';
 class Store<State extends BuiltReducer<State, StateBuilder>,
     StateBuilder extends Builder<State, StateBuilder>, Actions extends ReduxActions> {
   // stream used for dispatching actions
-  final StreamController<Action<dynamic>> _dispatch = new StreamController.broadcast();
+  final StreamController<Action<dynamic>> _dispatch = new StreamController();
 
   // stream used to dispatch changes to the state
   final StreamController<StoreChange<State, StateBuilder, dynamic>> _stateController =
@@ -44,7 +44,7 @@ class Store<State extends BuiltReducer<State, StateBuilder>,
       if (_state == state) return;
 
       // update the internal state and publish the change
-      _stateController.add(new StoreChange<State, StateBuilder, dynamic>(state, _state, action));
+      _stateController.add(new StoreChange<State, StateBuilder, Actions>(state, _state, action));
       _state = state;
     };
 

pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_redux
-version: 1.0.0
+version: 2.0.0
 description:
   A state management library written in dart that enforces immutability
 authors:
@@ -14,10 +14,9 @@ dependencies:
 dev_dependencies:
   build_runner: ^0.3.0
   built_value_generator: ^1.0.0
-  coverage: "^0.7.3"
   dart_dev: "^1.0.0"
-  dart_style: ">=0.2.0 <0.3.0"
-  dartdoc: ">=0.8.0 <=0.10.0"
+  dart_style: '>=0.2.4 <2.0.0'
+  coverage: ^0.7.3
   test: "^0.12.0"
 
 environment:

test/unit/redux_test.dart

@@ -33,9 +33,8 @@ main() {
       setup();
       Completer onStateChangeCompleter =
           new Completer<StoreChange<BaseCounter, BaseCounterBuilder, BaseCounterActions>>();
-      store.stream.listen(
-          (StoreChange<BaseCounter, BaseCounterBuilder, BaseCounterActions> state) =>
-              onStateChangeCompleter.complete(state));
+      store.stream.listen((StoreChange<BaseCounter, BaseCounterBuilder, dynamic> state) =>
+          onStateChangeCompleter.complete(state));
       store.actions.increment(4);
       var stateChange = await onStateChangeCompleter.future;
       expect(stateChange.prev.count, 1);

test/unit/test_counter.dart

@@ -91,9 +91,10 @@ abstract class MiddlewareActions extends ReduxActions {
   factory MiddlewareActions() => new _$MiddlewareActions();
 }
 
-var counterMiddleware = (new MiddlewareBuilder<BaseCounter, BaseCounterBuilder, BaseCounterActions>()
-      ..add<int>(MiddlewareActionsNames.increment, _doubleIt))
-    .build();
+var counterMiddleware =
+    (new MiddlewareBuilder<BaseCounter, BaseCounterBuilder, BaseCounterActions>()
+          ..add<int>(MiddlewareActionsNames.increment, _doubleIt))
+        .build();
 
 _doubleIt(MiddlewareApi<BaseCounter, BaseCounterBuilder, BaseCounterActions> api,
     ActionHandler next, Action<int> action) {

tool/dev.dart

@@ -5,7 +5,8 @@ import 'package:dart_dev/dart_dev.dart' show dev, config;
 main(List<String> args) async {
   const directories = const <String>[
     'lib/',
-    'test/',
+    'lib/src/',
+    'test/unit/',
   ];
 
   config.format..lineLength = 100;