@cocojs/mvc 0.1.0-beta.13 → 0.1.0-beta.14

package/dist/index.cjs.js

@@ -621,8 +621,8 @@ function createDecoratorExpFactory(fn) {
             }
           case KindMethod:
           case KindField:
-            break;
           case KindGetter:
+            break;
           case KindSetter:
           case KindAccessor:
           default:
@@ -632,6 +632,7 @@ function createDecoratorExpFactory(fn) {
           switch (context.kind) {
             case KindField:
             case KindMethod:
+            case KindGetter:
               fn(isPlaceholderExp, this.constructor, {
                 metadataKind: context.kind,
                 metadataClass: MetaClsOrPlaceholderMetaCls,
@@ -717,6 +718,7 @@ var Type;
   Type[Type["Class"] = KindClass] = "Class";
   Type[Type["Field"] = KindField] = "Field";
   Type[Type["Method"] = KindMethod] = "Method";
+  Type[Type["Getter"] = KindGetter] = "Getter";
 })(Type || (Type = {}));
 /**
  * @public
@@ -971,6 +973,9 @@ class MetadataRepository {
           case KindMethod:
             this.addMethodKindMetadata(beDecoratedCls, field, metadataClass, metadataParam);
             break;
+          case KindGetter:
+            this.addGetterKindMetadata(beDecoratedCls, field, metadataClass, metadataParam);
+            break;
         }
       }
     }
@@ -994,7 +999,8 @@ class MetadataRepository {
       config = {
         classMetadata: [],
         fieldMetadata: new Map(),
-        methodMetadata: new Map()
+        methodMetadata: new Map(),
+        getterMetadata: new Map()
       };
       map.set(cls, config);
     }
@@ -1044,6 +1050,22 @@ class MetadataRepository {
     const metadata = instantiateMetadata(MetadataCls, args);
     methodMetas.push(metadata);
   }
+  addGetterKindMetadata(Cls, fieldName, MetadataCls, args) {
+    let config = this.getMetadataByClass(Cls);
+    if (!config) {
+      config = this.addToMap(Cls);
+    }
+    const {
+      getterMetadata
+    } = config;
+    let methodMetas = getterMetadata.get(fieldName);
+    if (!methodMetas) {
+      methodMetas = [];
+      getterMetadata.set(fieldName, methodMetas);
+    }
+    const metadata = instantiateMetadata(MetadataCls, args);
+    methodMetas.push(metadata);
+  }
   /**
    * 获取指定类的类类型的元数据
    * @param beDecoratedCls 指定类
@@ -2084,7 +2106,8 @@ class IocComponentFactory {
       const {
         classMetadata,
         methodMetadata,
-        fieldMetadata
+        fieldMetadata,
+        getterMetadata
       } = metadatas;
       for (const meta of classMetadata) {
         const option = getCreateDecoratorOption(meta.constructor);
@@ -2114,6 +2137,17 @@ class IocComponentFactory {
           }
         }
       }
+      for (const [getter, metaList] of getterMetadata.entries()) {
+        for (const meta of metaList) {
+          const option = getCreateDecoratorOption(meta.constructor);
+          if (option) {
+            option.componentPostConstruct.call(component, meta, application, {
+              name: getter,
+              kind: KindGetter
+            });
+          }
+        }
+      }
     }
     return component;
   }
@@ -2859,7 +2893,7 @@ let _Memoized;
 new class extends _identity {
   static [class Memoized extends Metadata {
     static {
-      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field])], [], 0, void 0, Metadata).c;
+      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field, Target.Type.Getter])], [], 0, void 0, Metadata).c;
     }
   }];
   $$id = "Memoized";
@@ -2937,6 +2971,19 @@ var memoized = createDecoratorExp(Memoized, {
         const diagnose = createDiagnose(DiagnoseCode.CO10028, this.constructor.name, name, name, type);
         console.error(stringifyDiagnose(diagnose));
       }
+    } else if (kind === KindGetter) {
+      const descriptor = Object.getOwnPropertyDescriptor(this.constructor.prototype, name);
+      const getter = descriptor?.get;
+      if (typeof getter !== 'function') {
+        console.error("不应该拿不到getter函数");
+        return;
+      }
+      const subscriber = new Subscriber(getter.bind(this));
+      const memoizedGetter = subscriber.memoizedFn;
+      Object.defineProperty(this, name, {
+        ...descriptor,
+        get: memoizedGetter
+      });
     } else ;
   }
 });
@@ -7901,7 +7948,7 @@ let _Route;
 new class extends _identity {
   static [class Route {
     static {
-      [_Route, _initClass$6] = _applyDecs2311(this, [store()], []).c;
+      [_Route, _initClass$6] = _applyDecs2311(this, [component()], []).c;
     }
     // window.location.pathname
     pathname;

package/dist/index.d.ts

@@ -167,18 +167,21 @@ declare interface BizMetadata {
     classMetadata: Metadata[];
     fieldMetadata: Map<Field, Metadata[]>;
     methodMetadata: Map<Field, Metadata[]>;
+    getterMetadata: Map<Field, Metadata[]>;
 }
 
 declare interface BizMetadata_2 {
     classMetadata: Metadata_2[];
     fieldMetadata: Map<Field_2, Metadata_2[]>;
     methodMetadata: Map<Field_2, Metadata_2[]>;
+    getterMetadata: Map<Field_2, Metadata_2[]>;
 }
 
 declare interface BizMetadata_3 {
     classMetadata: Metadata_4[];
     fieldMetadata: Map<Field_3, Metadata_4[]>;
     methodMetadata: Map<Field_3, Metadata_4[]>;
+    getterMetadata: Map<Field_3, Metadata_4[]>;
 }
 
 /**
@@ -221,7 +224,12 @@ declare type ComponentClassPostConstructFn = (metadata: Metadata, application: A
  */
 declare type ComponentFieldPostConstructFn = (metadata: Metadata, application: Application, target: {
     name: Field;
-    kind: Kind;
+    kind: typeof KindField;
+}) => void;
+
+declare type ComponentGetterPostConstructFn = (metadata: Metadata, application: Application, target: {
+    name: Field;
+    kind: typeof KindGetter;
 }) => void;
 
 declare class ComponentMetadataClass {
@@ -283,10 +291,10 @@ declare class ComponentMetadataClass_3 {
  */
 declare type ComponentMethodPostConstructFn = (metadata: Metadata, application: Application, target: {
     name: Field;
-    kind: Kind;
+    kind: typeof KindMethod;
 }) => void;
 
-declare type ComponentPostConstruct = ComponentClassPostConstructFn | ComponentMethodPostConstructFn | ComponentFieldPostConstructFn;
+declare type ComponentPostConstruct = ComponentClassPostConstructFn | ComponentMethodPostConstructFn | ComponentFieldPostConstructFn | ComponentGetterPostConstructFn;
 
 /**
  * @public
@@ -760,11 +768,11 @@ declare function jsx(component: any, config: any, maybeKey?: any): {
 export { jsx }
 export { jsx as jsxs }
 
-declare type Kind = typeof KindClass | typeof KindField | typeof KindMethod;
+declare type Kind = typeof KindClass | typeof KindField | typeof KindMethod | typeof KindGetter;
 
-declare type Kind_2 = typeof KindClass_2 | typeof KindField_2 | typeof KindMethod_2;
+declare type Kind_2 = typeof KindClass_2 | typeof KindField_2 | typeof KindMethod_2 | typeof KindGetter_2;
 
-declare type Kind_3 = typeof KindClass_3 | typeof KindField_3 | typeof KindMethod_3;
+declare type Kind_3 = typeof KindClass_3 | typeof KindField_3 | typeof KindMethod_3 | typeof KindGetter_3;
 
 export declare const KindClass = "class";
 
@@ -778,6 +786,12 @@ declare const KindField_2 = "field";
 
 declare const KindField_3 = "field";
 
+declare const KindGetter = "getter";
+
+declare const KindGetter_2 = "getter";
+
+declare const KindGetter_3 = "getter";
+
 export declare const KindMethod = "method";
 
 declare const KindMethod_2 = "method";
@@ -854,11 +868,13 @@ declare class MetadataRepository {
         classMetadata: Metadata[];
         fieldMetadata?: Map<Field, Metadata[]>;
         methodMetadata?: Map<Field, Metadata[]>;
+        getterMetadata?: Map<Field, Metadata[]>;
     };
     private addToMap;
     addClassKindMetadata(cls: Class<any>, MetadataCls?: Class<Metadata>, args?: any): void;
     addFieldKindMetadata(Cls: Class<any>, fieldName: Field, MetadataCls: Class<Metadata>, args?: any): void;
     addMethodKindMetadata(Cls: Class<any>, fieldName: Field, MetadataCls: Class<Metadata>, args?: any): void;
+    addGetterKindMetadata(Cls: Class<any>, fieldName: Field, MetadataCls: Class<Metadata>, args?: any): void;
     /**
      * 获取指定类的类类型的元数据
      * @param beDecoratedCls 指定类
@@ -911,11 +927,13 @@ declare class MetadataRepository_2 {
         classMetadata: Metadata_2[];
         fieldMetadata?: Map<Field_2, Metadata_2[]>;
         methodMetadata?: Map<Field_2, Metadata_2[]>;
+        getterMetadata?: Map<Field_2, Metadata_2[]>;
     };
     private addToMap;
     addClassKindMetadata(cls: Class<any>, MetadataCls?: Class<Metadata_2>, args?: any): void;
     addFieldKindMetadata(Cls: Class<any>, fieldName: Field_2, MetadataCls: Class<Metadata_2>, args?: any): void;
     addMethodKindMetadata(Cls: Class<any>, fieldName: Field_2, MetadataCls: Class<Metadata_2>, args?: any): void;
+    addGetterKindMetadata(Cls: Class<any>, fieldName: Field_2, MetadataCls: Class<Metadata_2>, args?: any): void;
     /**
      * 获取指定类的类类型的元数据
      * @param beDecoratedCls 指定类
@@ -968,11 +986,13 @@ declare class MetadataRepository_3 {
         classMetadata: Metadata_4[];
         fieldMetadata?: Map<Field_3, Metadata_4[]>;
         methodMetadata?: Map<Field_3, Metadata_4[]>;
+        getterMetadata?: Map<Field_3, Metadata_4[]>;
     };
     private addToMap;
     addClassKindMetadata(cls: Class<any>, MetadataCls?: Class<Metadata_4>, args?: any): void;
     addFieldKindMetadata(Cls: Class<any>, fieldName: Field_3, MetadataCls: Class<Metadata_4>, args?: any): void;
     addMethodKindMetadata(Cls: Class<any>, fieldName: Field_3, MetadataCls: Class<Metadata_4>, args?: any): void;
+    addGetterKindMetadata(Cls: Class<any>, fieldName: Field_3, MetadataCls: Class<Metadata_4>, args?: any): void;
     /**
      * 获取指定类的类类型的元数据
      * @param beDecoratedCls 指定类
@@ -1019,18 +1039,21 @@ declare interface MetaMetadata {
     classMetadata: Metadata[];
     fieldMetadata: Map<Field, Metadata[]>;
     methodMetadata: Map<Field, Metadata[]>;
+    getterMetadata: Map<Field, Metadata[]>;
 }
 
 declare interface MetaMetadata_2 {
     classMetadata: Metadata_2[];
     fieldMetadata: Map<Field_2, Metadata_2[]>;
     methodMetadata: Map<Field_2, Metadata_2[]>;
+    getterMetadata: Map<Field_2, Metadata_2[]>;
 }
 
 declare interface MetaMetadata_3 {
     classMetadata: Metadata_4[];
     fieldMetadata: Map<Field_3, Metadata_4[]>;
     methodMetadata: Map<Field_3, Metadata_4[]>;
+    getterMetadata: Map<Field_3, Metadata_4[]>;
 }
 
 /**
@@ -1267,7 +1290,8 @@ export declare const target: DecoratorExpWithDecoratorSelf<Type[]>;
 export declare enum Type {
     Class = "class",
     Field = "field",
-    Method = "method"
+    Method = "method",
+    Getter = "getter"
 }
 
 /**

package/dist/index.esm.js

@@ -619,8 +619,8 @@ function createDecoratorExpFactory(fn) {
             }
           case KindMethod:
           case KindField:
-            break;
           case KindGetter:
+            break;
           case KindSetter:
           case KindAccessor:
           default:
@@ -630,6 +630,7 @@ function createDecoratorExpFactory(fn) {
           switch (context.kind) {
             case KindField:
             case KindMethod:
+            case KindGetter:
               fn(isPlaceholderExp, this.constructor, {
                 metadataKind: context.kind,
                 metadataClass: MetaClsOrPlaceholderMetaCls,
@@ -715,6 +716,7 @@ var Type;
   Type[Type["Class"] = KindClass] = "Class";
   Type[Type["Field"] = KindField] = "Field";
   Type[Type["Method"] = KindMethod] = "Method";
+  Type[Type["Getter"] = KindGetter] = "Getter";
 })(Type || (Type = {}));
 /**
  * @public
@@ -969,6 +971,9 @@ class MetadataRepository {
           case KindMethod:
             this.addMethodKindMetadata(beDecoratedCls, field, metadataClass, metadataParam);
             break;
+          case KindGetter:
+            this.addGetterKindMetadata(beDecoratedCls, field, metadataClass, metadataParam);
+            break;
         }
       }
     }
@@ -992,7 +997,8 @@ class MetadataRepository {
       config = {
         classMetadata: [],
         fieldMetadata: new Map(),
-        methodMetadata: new Map()
+        methodMetadata: new Map(),
+        getterMetadata: new Map()
       };
       map.set(cls, config);
     }
@@ -1042,6 +1048,22 @@ class MetadataRepository {
     const metadata = instantiateMetadata(MetadataCls, args);
     methodMetas.push(metadata);
   }
+  addGetterKindMetadata(Cls, fieldName, MetadataCls, args) {
+    let config = this.getMetadataByClass(Cls);
+    if (!config) {
+      config = this.addToMap(Cls);
+    }
+    const {
+      getterMetadata
+    } = config;
+    let methodMetas = getterMetadata.get(fieldName);
+    if (!methodMetas) {
+      methodMetas = [];
+      getterMetadata.set(fieldName, methodMetas);
+    }
+    const metadata = instantiateMetadata(MetadataCls, args);
+    methodMetas.push(metadata);
+  }
   /**
    * 获取指定类的类类型的元数据
    * @param beDecoratedCls 指定类
@@ -2082,7 +2104,8 @@ class IocComponentFactory {
       const {
         classMetadata,
         methodMetadata,
-        fieldMetadata
+        fieldMetadata,
+        getterMetadata
       } = metadatas;
       for (const meta of classMetadata) {
         const option = getCreateDecoratorOption(meta.constructor);
@@ -2112,6 +2135,17 @@ class IocComponentFactory {
           }
         }
       }
+      for (const [getter, metaList] of getterMetadata.entries()) {
+        for (const meta of metaList) {
+          const option = getCreateDecoratorOption(meta.constructor);
+          if (option) {
+            option.componentPostConstruct.call(component, meta, application, {
+              name: getter,
+              kind: KindGetter
+            });
+          }
+        }
+      }
     }
     return component;
   }
@@ -2857,7 +2891,7 @@ let _Memoized;
 new class extends _identity {
   static [class Memoized extends Metadata {
     static {
-      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field])], [], 0, void 0, Metadata).c;
+      [_Memoized, _initClass$k] = _applyDecs2311(this, [target([Target.Type.Method, Target.Type.Field, Target.Type.Getter])], [], 0, void 0, Metadata).c;
     }
   }];
   $$id = "Memoized";
@@ -2935,6 +2969,19 @@ var memoized = createDecoratorExp(Memoized, {
         const diagnose = createDiagnose(DiagnoseCode.CO10028, this.constructor.name, name, name, type);
         console.error(stringifyDiagnose(diagnose));
       }
+    } else if (kind === KindGetter) {
+      const descriptor = Object.getOwnPropertyDescriptor(this.constructor.prototype, name);
+      const getter = descriptor?.get;
+      if (typeof getter !== 'function') {
+        console.error("不应该拿不到getter函数");
+        return;
+      }
+      const subscriber = new Subscriber(getter.bind(this));
+      const memoizedGetter = subscriber.memoizedFn;
+      Object.defineProperty(this, name, {
+        ...descriptor,
+        get: memoizedGetter
+      });
     } else ;
   }
 });
@@ -7899,7 +7946,7 @@ let _Route;
 new class extends _identity {
   static [class Route {
     static {
-      [_Route, _initClass$6] = _applyDecs2311(this, [store()], []).c;
+      [_Route, _initClass$6] = _applyDecs2311(this, [component()], []).c;
     }
     // window.location.pathname
     pathname;

package/package.json

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