chore: bump dependencies

Author: Brooooooklyn

package.json

@@ -62,43 +62,44 @@
   },
   "devDependencies": {
     "@asuka/di": "^0.1.5",
-    "@types/jest": "^24.0.11",
-    "@types/lodash": "^4.14.123",
-    "@types/node": "^12.0.0",
-    "@types/react": "^16.8.10",
-    "@types/react-dom": "^16.8.3",
-    "@types/react-test-renderer": "^16.8.1",
+    "@types/jest": "^24.0.16",
+    "@types/lodash": "^4.14.136",
+    "@types/node": "^12.6.9",
+    "@types/react": "^16.8.24",
+    "@types/react-dom": "^16.8.5",
+    "@types/react-test-renderer": "^16.8.3",
     "@types/shallowequal": "^1.1.1",
-    "@typescript-eslint/eslint-plugin": "^1.7.0",
-    "codecov": "^3.2.0",
-    "eslint": "5.3.0",
-    "eslint-config-prettier": "^5.0.0",
-    "eslint-plugin-react": "^7.12.4",
-    "husky": "^3.0.0",
-    "immer": "^3.1.2",
-    "jest": "^24.5.0",
-    "lint-staged": "^9.1.0",
-    "lodash": "^4.17.11",
+    "@typescript-eslint/eslint-plugin": "^1.13.0",
+    "@typescript-eslint/parser": "^1.13.0",
+    "codecov": "^3.5.0",
+    "eslint": "6.1.0",
+    "eslint-config-prettier": "^6.0.0",
+    "eslint-plugin-react": "^7.14.3",
+    "husky": "^3.0.2",
+    "immer": "^3.2.0",
+    "jest": "^24.8.0",
+    "lint-staged": "^9.2.1",
+    "lodash": "^4.17.15",
     "madge": "^3.4.4",
     "npm-run-all": "^4.1.5",
     "parcel": "^1.12.3",
-    "prettier": "^1.16.4",
+    "prettier": "^1.18.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-test-renderer": "^16.8.6",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.4.0",
+    "rxjs": "^6.5.2",
     "shx": "^0.3.2",
-    "ts-jest": "^24.0.1",
-    "tslib": "^1.9.3",
-    "typescript": "^3.4.4"
+    "ts-jest": "^24.0.2",
+    "tslib": "^1.10.0",
+    "typescript": "^3.5.3"
   },
   "peerDependencies": {
-    "@asuka/di": "^0.1.3",
-    "immer": "^3.1.2",
-    "lodash": "^4.17.11",
+    "@asuka/di": "^0.1.5",
+    "immer": "^3.2.0",
+    "lodash": "^4.17.15",
     "react": "^16.8.6",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.4.0"
+    "rxjs": "^6.5.2"
   }
 }

src/core/decorators/action-related.ts

@@ -1,4 +1,6 @@
 import { allActionSymbols, ActionSymbols } from '../symbols'
+import { Ayanami } from '../ayanami'
+import { ConstructorOf } from '../types'
 
 export function createActionDecorator(symbols: ActionSymbols) {
   return () => ({ constructor }: any, propertyKey: string) => {
@@ -11,13 +13,19 @@ function addActionName(symbols: ActionSymbols, constructor: Function, actionName
   Reflect.defineMetadata(symbols.decorator, [...decoratedActionNames, actionName], constructor)
 }
 
-export function getActionNames(symbols: ActionSymbols, constructor: Function): string[] {
+export function getActionNames<T extends Ayanami<any>>(
+  symbols: ActionSymbols,
+  constructor: ConstructorOf<T>,
+): (keyof T)[] {
   return Reflect.getMetadata(symbols.decorator, constructor) || []
 }
 
-export function getAllActionNames(instance: { constructor: Function }) {
-  return allActionSymbols.reduce<string[]>(
-    (result, symbols) => [...result, ...getActionNames(symbols, instance.constructor)],
+export function getAllActionNames<T extends Ayanami<any>>(instance: T) {
+  return allActionSymbols.reduce<(keyof T)[]>(
+    (result, symbols) => [
+      ...result,
+      ...getActionNames(symbols, instance.constructor as ConstructorOf<T>),
+    ],
     [],
   )
 }

src/core/utils/get-original-functions.ts

@@ -1,21 +1,25 @@
 import { Subject } from 'rxjs'
-import { pick, mapValues } from 'lodash'
 
 import {
   OriginalDefineActions,
   OriginalEffectActions,
   OriginalReducerActions,
   OriginalImmerReducerActions,
+  ConstructorOf,
 } from '../types'
 import { Ayanami } from '../ayanami'
 import { getActionNames } from '../decorators'
 import { effectSymbols, reducerSymbols, immerReducerSymbols, defineActionSymbols } from '../symbols'
 
 const getOriginalFunctionNames = (ayanami: Ayanami<any>) => ({
-  effects: getActionNames(effectSymbols, ayanami.constructor),
-  reducers: getActionNames(reducerSymbols, ayanami.constructor),
-  defineActions: getActionNames(defineActionSymbols, ayanami.constructor),
-  immerReducers: getActionNames(immerReducerSymbols, ayanami.constructor),
+  effects: getActionNames(effectSymbols, ayanami.constructor as ConstructorOf<Ayanami<any>>),
+  reducers: getActionNames(reducerSymbols, ayanami.constructor as ConstructorOf<Ayanami<any>>),
+  defineActions: getActionNames(defineActionSymbols, ayanami.constructor as ConstructorOf<
+    Ayanami<any>
+  >),
+  immerReducers: getActionNames(immerReducerSymbols, ayanami.constructor as ConstructorOf<
+    Ayanami<any>
+  >),
 })
 
 const transformDefineActions = (actionNames: string[]): OriginalDefineActions => {
@@ -37,15 +41,18 @@ export const getOriginalFunctions = (ayanami: Ayanami<any>) => {
   const { effects, reducers, immerReducers, defineActions } = getOriginalFunctionNames(ayanami)
 
   return {
-    effects: mapValues(pick(ayanami, effects), (func: Function) =>
-      func.bind(ayanami),
-    ) as OriginalEffectActions<any>,
-    reducers: mapValues(pick(ayanami, reducers), (func: Function) =>
-      func.bind(ayanami),
-    ) as OriginalReducerActions<any>,
-    immerReducers: mapValues(pick(ayanami, immerReducers), (func: Function) =>
-      func.bind(ayanami),
-    ) as OriginalImmerReducerActions<any>,
+    effects: effects.reduce<OriginalEffectActions<any>>((acc, method) => {
+      acc[method] = ayanami[method].bind(ayanami)
+      return acc
+    }, {}),
+    reducers: reducers.reduce<OriginalReducerActions<any>>((acc, method) => {
+      acc[method] = ayanami[method].bind(ayanami)
+      return acc
+    }, {}),
+    immerReducers: immerReducers.reduce<OriginalImmerReducerActions<any>>((acc, method) => {
+      acc[method] = ayanami[method].bind(ayanami)
+      return acc
+    }, {}),
     defineActions: transformDefineActions(defineActions),
   }
 }