@cocojs/mvc 0.1.0-beta.10 → 0.1.0-beta.12

package/dist/index.cjs.js

@@ -327,6 +327,8 @@ var DiagnoseCode;
   DiagnoseCode["CO10025"] = "CO10025";
   DiagnoseCode["CO10026"] = "CO10026";
   DiagnoseCode["CO10027"] = "CO10027";
+  DiagnoseCode["CO10028"] = "CO10028";
+  DiagnoseCode["CO10029"] = "CO10029";
 })(DiagnoseCode || (DiagnoseCode = {}));
 const DiagnoseCodeMsg = {
   [DiagnoseCode.CO10001]: '每个类最多只能添加一个component装饰器，但 %s 添加了：%s',
@@ -355,7 +357,9 @@ const DiagnoseCodeMsg = {
   [DiagnoseCode.CO10024]: `元数据类 %s 存在多个组件装饰器 %s，一个元数据类最多只能有一个组件装饰器。`,
   [DiagnoseCode.CO10025]: `findClassKindMetadataRecursively的第二个参数 %s 必须是元数据类。`,
   [DiagnoseCode.CO10026]: '在一个字段上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s',
-  [DiagnoseCode.CO10027]: '在一个方法上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s'
+  [DiagnoseCode.CO10027]: '在一个方法上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s',
+  [DiagnoseCode.CO10028]: '%s 类 %s 字段上memoized装饰器，但 %s 的值必须是函数，不能是 %s',
+  [DiagnoseCode.CO10029]: '更新 %s 组件的 %s 字段需要通过视图组件的属性更新，不能独立使用store更新或多次更新'
 };
 function createDiagnose(code, ...args) {
   return {
@@ -928,12 +932,15 @@ new class extends _identity {
 var Value = _Value;
 
 var value = createDecoratorExp(Value, {
-  componentPostConstruct: function (metadata, application, field) {
+  componentPostConstruct: function (metadata, application, target) {
     const path = metadata.value;
     if (typeof path !== 'string' || !path.trim()) {
       return;
     }
-    this[field] = application.propertiesConfig.getValue(path);
+    const {
+      name
+    } = target;
+    this[name] = application.propertiesConfig.getValue(path);
   }
 });
 
@@ -2089,7 +2096,10 @@ class IocComponentFactory {
         for (const meta of metaList) {
           const option = getCreateDecoratorOption(meta.constructor);
           if (option) {
-            option.componentPostConstruct.call(component, meta, application, field);
+            option.componentPostConstruct.call(component, meta, application, {
+              name: field,
+              kind: KindField
+            });
           }
         }
       }
@@ -2097,7 +2107,10 @@ class IocComponentFactory {
         for (const meta of metaList) {
           const option = getCreateDecoratorOption(meta.constructor);
           if (option) {
-            option.componentPostConstruct.call(component, meta, application, method);
+            option.componentPostConstruct.call(component, meta, application, {
+              name: method,
+              kind: KindMethod
+            });
           }
         }
       }
@@ -2481,8 +2494,11 @@ new class extends _identity {
 var Bind = _Bind;
 
 var bind = createDecoratorExp(Bind, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = this[field].bind(this);
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name
+    } = target;
+    this[name] = this[name].bind(this);
   }
 });
 
@@ -2843,7 +2859,7 @@ let _Memoized;
 new class extends _identity {
   static [class Memoized extends Metadata {
     static {
-      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method])], [], 0, void 0, Metadata).c;
+      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field])], [], 0, void 0, Metadata).c;
     }
   }];
   $$id = "Memoized";
@@ -2897,11 +2913,31 @@ class Subscriber {
   }
 }
 
+function isArrowFunction(v) {
+  return !v.hasOwnProperty('prototype');
+}
 var memoized = createDecoratorExp(Memoized, {
-  componentPostConstruct: function (metadata, application, field) {
-    const fn = this[field];
-    const subscriber = new Subscriber(fn.bind(this));
-    this[field] = subscriber.memoizedFn;
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name,
+      kind
+    } = target;
+    if (kind === KindMethod) {
+      const fn = this[name];
+      const subscriber = new Subscriber(fn.bind(this));
+      this[name] = subscriber.memoizedFn;
+    } else if (kind === KindField) {
+      const func = this[name];
+      const type = typeof func;
+      if (type === 'function') {
+        const bindThisFunc = isArrowFunction(func) ? func : func.bind(this);
+        const subscriber = new Subscriber(bindThisFunc);
+        this[name] = subscriber.memoizedFn;
+      } else {
+        const diagnose = createDiagnose(DiagnoseCode.CO10028, this.constructor.name, name, name, type);
+        console.error(stringifyDiagnose(diagnose));
+      }
+    } else ;
   }
 });
 
@@ -2998,7 +3034,10 @@ function definePublisher(object, field, getter, setter) {
 }
 
 var reactive = createDecoratorExp(Reactive, {
-  componentPostConstruct(metadata, application, name) {
+  componentPostConstruct(metadata, application, target) {
+    const {
+      name
+    } = target;
     // TODO: 限制只能在store或view组件内部
     let value = this[name];
     definePublisher(this, name, function getter() {
@@ -3036,8 +3075,11 @@ new class extends _identity {
 var Ref$1 = _Ref;
 
 var ref = createDecoratorExp(Ref$1, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = {
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name
+    } = target;
+    this[name] = {
       current: null
     };
   }
@@ -3062,8 +3104,8 @@ new class extends _identity {
 var Refs = _Refs;
 
 var refs = createDecoratorExp(Refs, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = {};
+  componentPostConstruct: function (metadata, application, target) {
+    this[target.name] = {};
   }
 });
 
@@ -6299,7 +6341,7 @@ const storeComponentUpdater = {
         // 使用后立刻清空标记
         inst[bindViewInst] = null;
         if (viewInstance === null || viewInstance === undefined) {
-            console.error("store只能通过视图组件的属性更新状态。");
+            console.error(stringifyDiagnose(createDiagnose(DiagnoseCode.CO10029, inst.constructor.name, field)));
             return;
         }
         const update = createUpdate(field);
@@ -6319,18 +6361,21 @@ function reactiveStoreField(ctor, viewComponent) {
     // 找到所有的注入
     const Autowired = application.getMetaClassById('Autowired');
     const autowiredFields = application.listFieldByMetadataCls(ctor, Autowired);
+    const Store = application.getMetaClassById('Store');
     autowiredFields.forEach((field) => {
-        const storeInst = viewComponent[field];
-        Object.defineProperty(viewComponent, field, {
-            get() {
-                // 每次访问前设置标记
-                storeInst[bindViewInst] = viewComponent;
-                return storeInst;
-            },
-            set() {
-                console.error('store实例在初始化之后不允许修改');
-            }
-        });
+        const component = viewComponent[field];
+        if (application.findClassKindMetadataRecursively(component.constructor, Store, 0)) {
+            Object.defineProperty(viewComponent, field, {
+                get() {
+                    // 每次访问前设置标记
+                    component[bindViewInst] = viewComponent;
+                    return component;
+                },
+                set() {
+                    console.error('store实例在初始化之后不允许修改');
+                }
+            });
+        }
     });
 }
 /**
@@ -6354,12 +6399,19 @@ function getAutowiredStores(ctor, instance) {
     });
     return uniqueStores;
 }
-function createFiber() {
+function createFiber(storeInstance) {
+    const ctor = storeInstance.constructor;
+    const { application } = getCommonApi();
+    const Autowired = application.getMetaClassById('Autowired');
+    const autowiredFields = application.listFieldByMetadataCls(ctor, Autowired);
     return {
         alternate: null,
         stateNode: null,
         updateQueue: null,
-        memoizedState: null,
+        memoizedState: autowiredFields.reduce((prev, field) => {
+            prev[field] = storeInstance[field];
+            return prev;
+        }, {}),
     };
 }
 /**
@@ -6382,11 +6434,12 @@ function processUpdateQueueForStore(ctor, instance) {
         });
     }
 }
+// TODO 放在store组件实例化的地方
 function initFiber(storeInstance) {
     if (storeInstance[fiberField]) {
         return;
     }
-    storeInstance[fiberField] = createFiber();
+    storeInstance[fiberField] = createFiber(storeInstance);
     storeInstance[updaterField] = storeComponentUpdater;
     initializeUpdateQueue(storeInstance[fiberField]);
 }

package/dist/index.d.ts

@@ -217,9 +217,12 @@ declare type ComponentClassPostConstructFn = (metadata: Metadata, application: A
  * @public
  * @param metadata - 元数据实例对象
  * @param application - 全局的application对象
- * @param field - 被装饰的字段名
+ * @param target - 被装饰字段或方法
  */
-declare type ComponentFieldPostConstructFn = (metadata: Metadata, application: Application, field: Field) => void;
+declare type ComponentFieldPostConstructFn = (metadata: Metadata, application: Application, target: {
+    name: Field;
+    kind: Kind;
+}) => void;
 
 declare class ComponentMetadataClass {
     isComponent: Map<Class<Metadata>, boolean>;
@@ -278,7 +281,10 @@ declare class ComponentMetadataClass_3 {
 /**
  * @public
  */
-declare type ComponentMethodPostConstructFn = (metadata: Metadata, application: Application, field: Field) => void;
+declare type ComponentMethodPostConstructFn = (metadata: Metadata, application: Application, target: {
+    name: Field;
+    kind: Kind;
+}) => void;
 
 declare type ComponentPostConstruct = ComponentClassPostConstructFn | ComponentMethodPostConstructFn | ComponentFieldPostConstructFn;
 
@@ -417,6 +423,8 @@ declare enum DiagnoseCode {
     'CO10025' = 'CO10025', // findClassKindMetadataRecursively参数错误，入参不是元数据类
     'CO10026' = 'CO10026', // 不能添加多个相同的 field 装饰器
     'CO10027' = 'CO10027', // 不能添加多个相同的 method 装饰器
+    'CO10028' = 'CO10028', // memoized装饰了field类型，但值不是箭头函数
+    'CO10029' = 'CO10029', // store组件的更新方法不正确
 }
 
 declare enum DiagnoseCode_2 {
@@ -447,6 +455,8 @@ declare enum DiagnoseCode_2 {
     'CO10025' = 'CO10025', // findClassKindMetadataRecursively参数错误，入参不是元数据类
     'CO10026' = 'CO10026', // 不能添加多个相同的 field 装饰器
     'CO10027' = 'CO10027', // 不能添加多个相同的 method 装饰器
+    'CO10028' = 'CO10028', // memoized装饰了field类型，但值不是箭头函数
+    'CO10029' = 'CO10029', // store组件的更新方法不正确
 }
 
 declare enum DiagnoseCode_3 {
@@ -477,6 +487,8 @@ declare enum DiagnoseCode_3 {
     'CO10025' = 'CO10025', // findClassKindMetadataRecursively参数错误，入参不是元数据类
     'CO10026' = 'CO10026', // 不能添加多个相同的 field 装饰器
     'CO10027' = 'CO10027', // 不能添加多个相同的 method 装饰器
+    'CO10028' = 'CO10028', // memoized装饰了field类型，但值不是箭头函数
+    'CO10029' = 'CO10029', // store组件的更新方法不正确
 }
 
 declare class DynamicRoute {

package/dist/index.esm.js

@@ -325,6 +325,8 @@ var DiagnoseCode;
   DiagnoseCode["CO10025"] = "CO10025";
   DiagnoseCode["CO10026"] = "CO10026";
   DiagnoseCode["CO10027"] = "CO10027";
+  DiagnoseCode["CO10028"] = "CO10028";
+  DiagnoseCode["CO10029"] = "CO10029";
 })(DiagnoseCode || (DiagnoseCode = {}));
 const DiagnoseCodeMsg = {
   [DiagnoseCode.CO10001]: '每个类最多只能添加一个component装饰器，但 %s 添加了：%s',
@@ -353,7 +355,9 @@ const DiagnoseCodeMsg = {
   [DiagnoseCode.CO10024]: `元数据类 %s 存在多个组件装饰器 %s，一个元数据类最多只能有一个组件装饰器。`,
   [DiagnoseCode.CO10025]: `findClassKindMetadataRecursively的第二个参数 %s 必须是元数据类。`,
   [DiagnoseCode.CO10026]: '在一个字段上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s',
-  [DiagnoseCode.CO10027]: '在一个方法上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s'
+  [DiagnoseCode.CO10027]: '在一个方法上不能添加多次同一个装饰器，但 %s 上 %s 字段存在重复装饰器: %s',
+  [DiagnoseCode.CO10028]: '%s 类 %s 字段上memoized装饰器，但 %s 的值必须是函数，不能是 %s',
+  [DiagnoseCode.CO10029]: '更新 %s 组件的 %s 字段需要通过视图组件的属性更新，不能独立使用store更新或多次更新'
 };
 function createDiagnose(code, ...args) {
   return {
@@ -926,12 +930,15 @@ new class extends _identity {
 var Value = _Value;
 
 var value = createDecoratorExp(Value, {
-  componentPostConstruct: function (metadata, application, field) {
+  componentPostConstruct: function (metadata, application, target) {
     const path = metadata.value;
     if (typeof path !== 'string' || !path.trim()) {
       return;
     }
-    this[field] = application.propertiesConfig.getValue(path);
+    const {
+      name
+    } = target;
+    this[name] = application.propertiesConfig.getValue(path);
   }
 });
 
@@ -2087,7 +2094,10 @@ class IocComponentFactory {
         for (const meta of metaList) {
           const option = getCreateDecoratorOption(meta.constructor);
           if (option) {
-            option.componentPostConstruct.call(component, meta, application, field);
+            option.componentPostConstruct.call(component, meta, application, {
+              name: field,
+              kind: KindField
+            });
           }
         }
       }
@@ -2095,7 +2105,10 @@ class IocComponentFactory {
         for (const meta of metaList) {
           const option = getCreateDecoratorOption(meta.constructor);
           if (option) {
-            option.componentPostConstruct.call(component, meta, application, method);
+            option.componentPostConstruct.call(component, meta, application, {
+              name: method,
+              kind: KindMethod
+            });
           }
         }
       }
@@ -2479,8 +2492,11 @@ new class extends _identity {
 var Bind = _Bind;
 
 var bind = createDecoratorExp(Bind, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = this[field].bind(this);
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name
+    } = target;
+    this[name] = this[name].bind(this);
   }
 });
 
@@ -2841,7 +2857,7 @@ let _Memoized;
 new class extends _identity {
   static [class Memoized extends Metadata {
     static {
-      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method])], [], 0, void 0, Metadata).c;
+      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field])], [], 0, void 0, Metadata).c;
     }
   }];
   $$id = "Memoized";
@@ -2895,11 +2911,31 @@ class Subscriber {
   }
 }
 
+function isArrowFunction(v) {
+  return !v.hasOwnProperty('prototype');
+}
 var memoized = createDecoratorExp(Memoized, {
-  componentPostConstruct: function (metadata, application, field) {
-    const fn = this[field];
-    const subscriber = new Subscriber(fn.bind(this));
-    this[field] = subscriber.memoizedFn;
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name,
+      kind
+    } = target;
+    if (kind === KindMethod) {
+      const fn = this[name];
+      const subscriber = new Subscriber(fn.bind(this));
+      this[name] = subscriber.memoizedFn;
+    } else if (kind === KindField) {
+      const func = this[name];
+      const type = typeof func;
+      if (type === 'function') {
+        const bindThisFunc = isArrowFunction(func) ? func : func.bind(this);
+        const subscriber = new Subscriber(bindThisFunc);
+        this[name] = subscriber.memoizedFn;
+      } else {
+        const diagnose = createDiagnose(DiagnoseCode.CO10028, this.constructor.name, name, name, type);
+        console.error(stringifyDiagnose(diagnose));
+      }
+    } else ;
   }
 });
 
@@ -2996,7 +3032,10 @@ function definePublisher(object, field, getter, setter) {
 }
 
 var reactive = createDecoratorExp(Reactive, {
-  componentPostConstruct(metadata, application, name) {
+  componentPostConstruct(metadata, application, target) {
+    const {
+      name
+    } = target;
     // TODO: 限制只能在store或view组件内部
     let value = this[name];
     definePublisher(this, name, function getter() {
@@ -3034,8 +3073,11 @@ new class extends _identity {
 var Ref$1 = _Ref;
 
 var ref = createDecoratorExp(Ref$1, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = {
+  componentPostConstruct: function (metadata, application, target) {
+    const {
+      name
+    } = target;
+    this[name] = {
       current: null
     };
   }
@@ -3060,8 +3102,8 @@ new class extends _identity {
 var Refs = _Refs;
 
 var refs = createDecoratorExp(Refs, {
-  componentPostConstruct: function (metadata, application, field) {
-    this[field] = {};
+  componentPostConstruct: function (metadata, application, target) {
+    this[target.name] = {};
   }
 });
 
@@ -6297,7 +6339,7 @@ const storeComponentUpdater = {
         // 使用后立刻清空标记
         inst[bindViewInst] = null;
         if (viewInstance === null || viewInstance === undefined) {
-            console.error("store只能通过视图组件的属性更新状态。");
+            console.error(stringifyDiagnose(createDiagnose(DiagnoseCode.CO10029, inst.constructor.name, field)));
             return;
         }
         const update = createUpdate(field);
@@ -6317,18 +6359,21 @@ function reactiveStoreField(ctor, viewComponent) {
     // 找到所有的注入
     const Autowired = application.getMetaClassById('Autowired');
     const autowiredFields = application.listFieldByMetadataCls(ctor, Autowired);
+    const Store = application.getMetaClassById('Store');
     autowiredFields.forEach((field) => {
-        const storeInst = viewComponent[field];
-        Object.defineProperty(viewComponent, field, {
-            get() {
-                // 每次访问前设置标记
-                storeInst[bindViewInst] = viewComponent;
-                return storeInst;
-            },
-            set() {
-                console.error('store实例在初始化之后不允许修改');
-            }
-        });
+        const component = viewComponent[field];
+        if (application.findClassKindMetadataRecursively(component.constructor, Store, 0)) {
+            Object.defineProperty(viewComponent, field, {
+                get() {
+                    // 每次访问前设置标记
+                    component[bindViewInst] = viewComponent;
+                    return component;
+                },
+                set() {
+                    console.error('store实例在初始化之后不允许修改');
+                }
+            });
+        }
     });
 }
 /**
@@ -6352,12 +6397,19 @@ function getAutowiredStores(ctor, instance) {
     });
     return uniqueStores;
 }
-function createFiber() {
+function createFiber(storeInstance) {
+    const ctor = storeInstance.constructor;
+    const { application } = getCommonApi();
+    const Autowired = application.getMetaClassById('Autowired');
+    const autowiredFields = application.listFieldByMetadataCls(ctor, Autowired);
     return {
         alternate: null,
         stateNode: null,
         updateQueue: null,
-        memoizedState: null,
+        memoizedState: autowiredFields.reduce((prev, field) => {
+            prev[field] = storeInstance[field];
+            return prev;
+        }, {}),
     };
 }
 /**
@@ -6380,11 +6432,12 @@ function processUpdateQueueForStore(ctor, instance) {
         });
     }
 }
+// TODO 放在store组件实例化的地方
 function initFiber(storeInstance) {
     if (storeInstance[fiberField]) {
         return;
     }
-    storeInstance[fiberField] = createFiber();
+    storeInstance[fiberField] = createFiber(storeInstance);
     storeInstance[updaterField] = storeComponentUpdater;
     initializeUpdateQueue(storeInstance[fiberField]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocojs/mvc",
-  "version": "0.1.0-beta.10",
+  "version": "0.1.0-beta.12",
   "description": "由装饰器驱动，快速构建可扩展的 Web 应用。",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",