Merge pull request #15 from byte-fe/develop

fix(type): Fix the type definition of useStore that Model({...}) return

README.md

@@ -13,8 +13,9 @@ Running demo
 ```
 git clone https://github.com/byte-fe/react-modelx.git
 cd react-model/example
-yarn
-yarn dev
+npm i
+npm run initial
+npm run dev
 ```
 
 install package

package.json

@@ -17,13 +17,13 @@
   "author": "ArrayZoneYour <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "immer": "^1.9.3"
+    "immer": "^1.9.3",
+    "react": "^16.7.0-alpha.2",
+    "react-dom": "^16.7.0-alpha.2"
   },
   "devDependencies": {
     "@types/react": "^16.7.11",
     "@types/react-dom": "^16.0.11",
-    "react": "^16.7.0-alpha.2",
-    "react-dom": "^16.7.0-alpha.2",
     "typescript": "^3.2.1"
   },
   "repository": {

src/index.d.ts

@@ -18,7 +18,7 @@ interface Models {
   [name: string]: ModelType
 }
 
-type ModelType<InitStateType, ActionKeys> = {
+type ModelType<InitStateType = {}, ActionKeys = {}> = {
   actions: {
     [P in keyof ActionKeys]: Action<InitStateType, ActionKeys[P], ActionKeys>
   }
@@ -36,8 +36,3 @@ type getConsumerActionsType<T> = {
 }
 
 type Get<T, N extends keyof T> = T[N]
-
-type UseStore<K extends keyof M, M extends Models> = (
-  name: K,
-  models?: M
-) => [Get<M[K], 'state'>, getConsumerActionsType<Get<M[K], 'actions'>>]

src/index.tsx

@@ -25,7 +25,10 @@ const registerModel = <M extends Models>(models: M) => {
     ...models
   }
   return { useStore } as {
-    useStore: UseStore<keyof M, M>
+    useStore: <K extends keyof M>(
+      name: K,
+      models?: M
+    ) => [Get<M[K], 'state'>, getConsumerActionsType<Get<M[K], 'actions'>>]
   }
 }