From 36b5eadc994a20ca56f1fa6d3bc68523b38a6ec2 Mon Sep 17 00:00:00 2001 From: Kai Moseley Date: Tue, 29 Nov 2016 13:57:40 +0000 Subject: [PATCH] Clear flow errors --- src/redux-arg/reducers/objectReducer.js | 15 ++++++++------- src/redux-arg/reducers/primitiveReducer.js | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/redux-arg/reducers/objectReducer.js b/src/redux-arg/reducers/objectReducer.js index f090448..1a6fb62 100644 --- a/src/redux-arg/reducers/objectReducer.js +++ b/src/redux-arg/reducers/objectReducer.js @@ -1,16 +1,17 @@ //@flow -type ObjectReducerAction = { +export type ObjectReducerAction = { type: string, - payload?: Object, + payload?: any, }; -type ObjectReducer = (Object) => (Object, ObjectReducerAction) => Object; +export type ObjectReducerFactory = (structure: Object) => ObjectReducer; +export type ObjectReducer = (state: Object, action: ObjectReducerAction) => Object; -export function objectReducer(reducerStructureDescriptor: Object): ObjectReducer { - const { structure } = reducerStructureDescriptor(); - return (state = determineDefaults(reducerStructureDescriptor)(structure), { type, payload } = {}) => { + +export function objectReducer(): ObjectReducer { + return (state = {}, { type, payload } = {}) => { switch (type) { case 'BLARG!': - return { state, ...reducerStructureDescriptor, ...payload }; + return { state, ...payload }; default: return state; } diff --git a/src/redux-arg/reducers/primitiveReducer.js b/src/redux-arg/reducers/primitiveReducer.js index 07d68b0..550b0e9 100644 --- a/src/redux-arg/reducers/primitiveReducer.js +++ b/src/redux-arg/reducers/primitiveReducer.js @@ -1,18 +1,18 @@ //@flow import type { ReducerStructure } from '../structure'; -export type ObjectReducerAction = { +export type PrimitiveReducerAction = { type: string, - payload?: Object, + payload?: any, }; -export type ObjectReducerFactory = (structure: Object) => ObjectReducer; -export type ObjectReducer = (state: Object, action: ObjectReducerAction) => Object; +export type PrimitiveReducerFactory = (structure: Object) => PrimitiveReducer; +export type PrimitiveReducer = (state: any, action: PrimitiveReducerAction) => any; -export function arrayReducer(reducerStructureDescriptor: ReducerStructure) { - return(state: Object = calculateDefaults(reducerSructure), { type, payload = {}}: ObjectReducerAction = {}): Object => { +export function primitiveReducer(reducerStructureDescriptor: ReducerStructure) { + return(state: any = '', { type, payload }: PrimitiveReducerAction = {}) => { switch(type) { case 'BLARG3': - return [ state, ...payload ]; + return payload; default: return state; }