From c2b5b52b1fb1afacb0f1cda0d11bb99b8810d490 Mon Sep 17 00:00:00 2001
From: coderhxl <coderhxl@outlook.com>
Date: Sun, 27 Nov 2022 19:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BAStore=E5=90=8E=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E8=8E=B7=E5=8F=96=20storeApi=20/=20state=20/=20action?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/index.ts |  7 +++----
 src/proxy.ts | 12 ++++++------
 src/types.ts |  7 +------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index c7c190d..f564a87 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,10 +10,7 @@ import {
   IProxyInstanceRes
 } from './types'
 
-export default function xlStore<
-  S extends IState,
-  A extends IActions<IProxyInstanceRes<S, A>>
->(
+function xlStore<S extends IState, A extends IActions<IProxyInstanceRes<S, A>>>(
   storeArgs: IStoreArgs<S, A>,
   options?: IStoreOptionsArg
 ): IProxyInstanceRes<S, A> {
@@ -25,3 +22,5 @@ export default function xlStore<
 
   return proxyInstanceRes
 }
+
+module.exports = xlStore
diff --git a/src/proxy.ts b/src/proxy.ts
index cd9f4c8..e6f2f3c 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -22,27 +22,27 @@ export function proxyInstance<
   const { state, actions, storeApi } = instance
 
   return new Proxy<IProxyInstanceRes<S, A>>(instance as any, {
+    // storeApi => state => actions
+
     get(_, prop: string) {
-      if (prop in instance) {
-        return instance[prop as ObjectKey<IInstance<S, A>>]
-      } else if (prop in storeApi) {
+      if (prop in storeApi) {
         return storeApi[prop as ObjectKey<IStoreApi<S>>]
       } else if (prop in state) {
         return state[prop]
       } else if (prop in actions) {
         return actions[prop]
       } else {
-        throw new Error(`不能获取 ${prop}`)
+        return undefined
       }
     },
     set(_, prop: string, value: any) {
-      if (prop in instance || prop in storeApi) {
+      if (prop in storeApi) {
         throw new Error(`${prop} 是 Store 自带的不允许被修改`)
       } else if (prop in state) {
         state[prop as ObjectKey<S | IState>] = value
         return true
       } else if (prop in actions) {
-        throw new Error(`${prop} 是 actions , 不允许被修改`)
+        throw new Error(`${prop} 是 actions , 不允许在此被修改`)
       } else {
         throw new Error(`${prop} 不允许被修改或添加`)
       }
diff --git a/src/types.ts b/src/types.ts
index bd89926..2b60b75 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -62,9 +62,4 @@ export interface IStoreOptionsArg {
 export type IProxyInstanceRes<
   S extends IState,
   A extends IActions<IProxyInstanceRes<S, A>>
-> = S &
-  A &
-  IStoreApi<S> & {
-    id: number
-    trackStore: ITrackStore<S>
-  }
+> = S & A & IStoreApi<S>