Merge pull request #31 from simpleweb/reducer-improvements

Reducer improvements
simpleweb · Mar 6, 2018 · 3b315cb · 3b315cb
2 parents 97f65fb + b8a205c
commit 3b315cb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/generators/base/templates/App/Actions/App.js b/generators/base/templates/App/Actions/App.js
@@ -1,6 +1,10 @@
 // @flow
 export const APP_INSTALLED = '<%= name %>/APP_INSTALLED';
 
-export const appInstalled = () => ({
+export type AppInstalled = {
+  type: '<%= name %>/APP_INSTALLED',
+};
+
+export const appInstalled = (): AppInstalled => ({
   type: APP_INSTALLED,
 });
diff --git a/generators/base/templates/App/Reducers/App.js b/generators/base/templates/App/Reducers/App.js
@@ -1,15 +1,14 @@
 // @flow
 import { APP_INSTALLED } from '<%= name %>/App/Actions/App';
+import type { AppInstalled } from '<%= name %>/App/Actions/App';
 
 type State = {
-  installed: bool,
+  +installed: bool,
 };
 
-type Action = {
-  type: string,
-};
+type Action = AppInstalled;
 
-const initialState = {
+const initialState: State = {
   installed: false,
 };
 
@@ -22,6 +21,7 @@ const reducer = (state: State = initialState, action: Action): State => {
       };
 
     default:
+      (action: empty);
       return state;
   }
 };

diff --git a/generators/reducer/templates/actions.js b/generators/reducer/templates/actions.js
@@ -1,6 +1,10 @@
 // @flow
-export const <%= reducerConst %>_EXAMPLE = '<%= name %>/<%= reducerConst %>_EXAMPLE';
+export const <%= reducerConst %>_EXAMPLE = "<%= name %>/<%= reducerConst %>_EXAMPLE";
 
-export const <%= reducerSlug %>Example = () => ({
+export type <%= reducer %>Example = {
+  type: "<%= name %>/<%= reducerConst %>_EXAMPLE",
+};
+
+export const <%= reducerSlug %>Example = ():<%= reducer %>Example => ({
   type: <%= reducerConst %>_EXAMPLE,
 });
diff --git a/generators/reducer/templates/reducer.js b/generators/reducer/templates/reducer.js
@@ -1,19 +1,27 @@
 // @flow
-import { <%= reducerConst %>_EXAMPLE } from '<%= name %>/App/Actions/<%= reducer %>';
+import { <%= reducerConst %>_EXAMPLE } from "<%= name %>/App/Actions/<%= reducer %>";
+import type { <%= reducer %>Example } from "<%= name %>/App/Actions/<%= reducer %>";
 
 type State = {
+  +value: boolean,
 };
 
-type Action = {
-  type: string,
-};
+type Action = <%= reducer %>Example;
 
-const initialState = {
+const initialState: State = {
+  value: false,
 };
 
 const reducer = (state: State = initialState, action: Action): State => {
   switch(action.type) {
+    case <%= reducerConst %>_EXAMPLE:
+      return {
+        ...state,
+        value: true,
+      };
+
     default:
+      (action: empty);
       return state;
   }
 };