@cocojs/mvc 0.0.1-alpha.4 → 0.0.1-alpha.5

package/dist/index.cjs.js

@@ -448,7 +448,7 @@ function isClass(v) {
 function isCocoClass(v) {
   return typeof v === 'function' && v.prototype && v.prototype.constructor === v &&
   // 必须有$$cocoId属性
-  typeof v.$$cocoId === 'string' && v.$$cocoId.trim();
+  typeof v.$$id === 'string' && v.$$id.trim();
 }
 
 var defaultProp = 'value';
@@ -1015,7 +1015,7 @@ new (_Target2 = (_Target3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Target]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Target'), _defineProperty(_assertThisInitialized(_this2), "Type", Type), _initClass$x();
+    _this2 = _callSuper(this, _Class, [_Target]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Target'), _defineProperty(_assertThisInitialized(_this2), "Type", Type), _initClass$x();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1046,7 +1046,7 @@ new (_Autowired2 = (_Autowired3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Autowired]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Autowired'), _initClass$w();
+    _this2 = _callSuper(this, _Class, [_Autowired]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Autowired'), _initClass$w();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1057,42 +1057,42 @@ var Autowired = _Autowired;
 // TODO: cls?: Class<any>如果去掉的话，在项目中会报错，应该是ts-server是拿到参数了，但是声明中确没有
 var autowired = createDecoratorExp(Autowired);
 
-var _Class$v, _Cocoid3, _applyDecs$c$v;
-var _initClass$v, _Cocoid2;
+var _Class$v, _Id3, _applyDecs$c$v;
+var _initClass$v, _Id2;
 /**
  * @public
  */
-var _Cocoid;
-new (_Cocoid2 = (_Cocoid3 = /*#__PURE__*/function (_Metadata) {
-  function Cocoid() {
+var _Id;
+new (_Id2 = (_Id3 = /*#__PURE__*/function (_Metadata) {
+  function Id() {
     var _this;
-    _classCallCheck(this, Cocoid);
+    _classCallCheck(this, Id);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, Cocoid, [].concat(args));
+    _this = _callSuper(this, Id, [].concat(args));
     _defineProperty(_this, "value", void 0);
     return _this;
   }
-  _inherits(Cocoid, _Metadata);
-  return _createClass(Cocoid);
-}(Metadata), _applyDecs$c$v = _slicedToArray(_applyDecs2311(_Cocoid3, [target([Target.Type.Method])], [], 0, void 0, Metadata).c, 2), _Cocoid = _applyDecs$c$v[0], _initClass$v = _applyDecs$c$v[1], _Cocoid3), _Class$v = /*#__PURE__*/function (_identity2) {
+  _inherits(Id, _Metadata);
+  return _createClass(Id);
+}(Metadata), _applyDecs$c$v = _slicedToArray(_applyDecs2311(_Id3, [target([Target.Type.Method])], [], 0, void 0, Metadata).c, 2), _Id = _applyDecs$c$v[0], _initClass$v = _applyDecs$c$v[1], _Id3), _Class$v = /*#__PURE__*/function (_identity2) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Cocoid]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Cocoid'), _initClass$v();
+    _this2 = _callSuper(this, _Class, [_Id]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Id'), _initClass$v();
     return _this2;
   }
   _inherits(_Class, _identity2);
   return _createClass(_Class);
-}(_identity), _defineProperty(_Class$v, _Cocoid2, void 0), _Class$v)();
-var Cocoid = _Cocoid;
+}(_identity), _defineProperty(_Class$v, _Id2, void 0), _Class$v)();
+var Id = _Id;
 
 /**
- * @cocoid装饰器
- * 在使用@component方法装饰注入的普通类，必须使用@cocoid来申明组件的cocoid
+ * @id装饰器
+ * 在使用@component方法装饰注入的普通类，必须使用@id来申明组件的$$id
  */
-var cocoid = createDecoratorExp(Cocoid);
+var id$2 = createDecoratorExp(Id);
 
 var _Class$u, _Component3, _applyDecs$c$u;
 var _initClass$u, _Component2;
@@ -1121,7 +1121,7 @@ new (_Component2 = (_Component3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Component]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Component'), _initClass$u();
+    _this2 = _callSuper(this, _Class, [_Component]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Component'), _initClass$u();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1152,7 +1152,7 @@ new (_Configuration2 = (_Configuration3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Configuration]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Configuration'), _initClass$t();
+    _this = _callSuper(this, _Class, [_Configuration]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Configuration'), _initClass$t();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -1185,7 +1185,7 @@ new (_ConstructorParam2 = (_ConstructorParam3 = /*#__PURE__*/function (_Metadata
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_ConstructorParam]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'ConstructorParam'), _initClass$s();
+    _this2 = _callSuper(this, _Class, [_ConstructorParam]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'ConstructorParam'), _initClass$s();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1228,7 +1228,7 @@ new (_Scope2 = (_Scope3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Scope]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Scope'), _initClass$r();
+    _this2 = _callSuper(this, _Class, [_Scope]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Scope'), _initClass$r();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1261,7 +1261,7 @@ new (_Qualifier2 = (_Qualifier3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Qualifier]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Qualifier'), _initClass$q();
+    _this2 = _callSuper(this, _Class, [_Qualifier]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Qualifier'), _initClass$q();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -1294,7 +1294,7 @@ new (_Value2 = (_Value3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Value]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Value'), _initClass$p();
+    _this2 = _callSuper(this, _Class, [_Value]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Value'), _initClass$p();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -2569,27 +2569,27 @@ function validate(metadataList, componentMetadataClass) {
   return diagnoseList;
 }
 
-var CocoidClassMap = /*#__PURE__*/function () {
+var IdClassMap = /*#__PURE__*/function () {
   /**
    * * 保存元数据类本身，方便运行是通过id获取元数据类
    * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
    */
-  function CocoidClassMap(metaMetadataMap) {
-    _classCallCheck(this, CocoidClassMap);
-    _defineProperty(this, "cocoidClassMap", new Map());
+  function IdClassMap(metaMetadataMap) {
+    _classCallCheck(this, IdClassMap);
+    _defineProperty(this, "idClassMap", new Map());
     var _iterator = _createForOfIteratorHelper(metaMetadataMap.keys()),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var cls = _step.value;
-        var cocoId = cls.$$cocoId;
-        if (typeof cocoId !== 'string' || !cocoId.trim()) {
+        var id = cls.$$id;
+        if (typeof id !== 'string' || !id.trim()) {
           throw new Error(stringifyDiagnose(createDiagnose(DiagnoseCode.CO10016, cls.name)));
         }
-        if (this.cocoidClassMap.has(cocoId)) {
-          throw new Error(stringifyDiagnose(createDiagnose(DiagnoseCode.CO10017, cls, this.cocoidClassMap.get(cocoId))));
+        if (this.idClassMap.has(id)) {
+          throw new Error(stringifyDiagnose(createDiagnose(DiagnoseCode.CO10017, cls, this.idClassMap.get(id))));
         }
-        this.cocoidClassMap.set(cocoId, cls);
+        this.idClassMap.set(id, cls);
       }
     } catch (err) {
       _iterator.e(err);
@@ -2599,22 +2599,22 @@ var CocoidClassMap = /*#__PURE__*/function () {
   }
   /**
    * * 根据cocoId获取元数据类
-   * * @param cocoId 元数据类id
+   * * @param id 元数据类id
    * * @returns 元数据类
    */
-  return _createClass(CocoidClassMap, [{
+  return _createClass(IdClassMap, [{
     key: "getMetaClassById",
-    value: function getMetaClassById(cocoId) {
-      if (typeof cocoId !== 'string' || !cocoId.trim() || !this.cocoidClassMap.has(cocoId)) {
+    value: function getMetaClassById(id) {
+      if (typeof id !== 'string' || !id.trim() || !this.idClassMap.has(id)) {
         return null;
       } else {
-        return this.cocoidClassMap.get(cocoId);
+        return this.idClassMap.get(id);
       }
     }
   }, {
     key: "destructor",
     value: function destructor() {
-      this.cocoidClassMap.clear();
+      this.idClassMap.clear();
     }
   }]);
 }();
@@ -2635,20 +2635,20 @@ function initMetadataModule(decoratorMap) {
   if (diagnoseList.length > 0) {
     diagnoseList.forEach(printDiagnose);
   }
-  var cocoidClassMap = new CocoidClassMap(metadataMap);
+  var idClassMap = new IdClassMap(metadataMap);
   return {
     metadataRepository: metadataRepository,
-    cocoidClassMap: cocoidClassMap,
+    idClassMap: idClassMap,
     componentMetadataClass: componentMetadataClass
   };
 }
 // 元数据相关数据清理
-function clearMetadataModule(metadataRepository, cocoidClassMap, componentMetadataClass) {
+function clearMetadataModule(metadataRepository, idClassMap, componentMetadataClass) {
   if (metadataRepository) {
     metadataRepository.destructor();
   }
-  if (cocoidClassMap) {
-    cocoidClassMap.destructor();
+  if (idClassMap) {
+    idClassMap.destructor();
   }
   if (componentMetadataClass) {
     componentMetadataClass.destructor();
@@ -2717,9 +2717,9 @@ var IocComponentDefinition = /*#__PURE__*/function () {
   }
   return _createClass(IocComponentDefinition, [{
     key: "newIocComponentDefinition",
-    value: function newIocComponentDefinition(cocoid, cls, isSingleton, instantiateType) {
+    value: function newIocComponentDefinition(id, cls, isSingleton, instantiateType) {
       return {
-        cocoid: cocoid,
+        id: id,
         cls: cls,
         isSingleton: isSingleton,
         instantiateType: instantiateType
@@ -2727,11 +2727,11 @@ var IocComponentDefinition = /*#__PURE__*/function () {
     }
   }, {
     key: "addDefinition",
-    value: function addDefinition(cls, cocoid, isSingleton, methodInstantiateOpts) {
-      if (typeof cocoid !== 'string' || !cocoid.trim()) {
+    value: function addDefinition(cls, id, isSingleton, methodInstantiateOpts) {
+      if (typeof id !== 'string' || !id.trim()) {
         throw new Error("\u751F\u6210\u7EC4\u4EF6id\u5931\u8D25: [".concat(cls.name, "]"));
       }
-      var existIdDef = this.idDefinitionMap.get(cocoid);
+      var existIdDef = this.idDefinitionMap.get(id);
       if (existIdDef) {
         throw new Error("\u5B58\u5728cocoid\u7684\u7EC4\u4EF6: [".concat(existIdDef.cls.name, "] - [").concat(cls.name, "]"));
       }
@@ -2739,11 +2739,11 @@ var IocComponentDefinition = /*#__PURE__*/function () {
       if (existClsDef) {
         throw new Error("\u5B58\u5728\u540C\u540D\u7684\u7EC4\u4EF6: [".concat(existClsDef.cls.name, "] - [").concat(cls.name, "]"));
       }
-      var componentDefinition = this.newIocComponentDefinition(cocoid, cls, isSingleton, methodInstantiateOpts ? 'method' : 'new');
+      var componentDefinition = this.newIocComponentDefinition(id, cls, isSingleton, methodInstantiateOpts ? 'method' : 'new');
       if (methodInstantiateOpts) {
         componentDefinition.methodInstantiateOpts = methodInstantiateOpts;
       }
-      this.idDefinitionMap.set(cocoid, componentDefinition);
+      this.idDefinitionMap.set(id, componentDefinition);
       this.clsDefinitionMap.set(cls, componentDefinition);
     }
     /**
@@ -2778,7 +2778,7 @@ var IocComponentDefinition = /*#__PURE__*/function () {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var child = _step.value;
               var def = this.clsDefinitionMap.get(child);
-              if (def.cocoid === qualifier) {
+              if (def.id === qualifier) {
                 return def;
               }
             }
@@ -2789,12 +2789,12 @@ var IocComponentDefinition = /*#__PURE__*/function () {
           }
         }
         if (qualifier) {
-          var _diagnose = createDiagnose(DiagnoseCode.CO10010, definition.cocoid, descendantList.map(function (i) {
+          var _diagnose = createDiagnose(DiagnoseCode.CO10010, definition.id, descendantList.map(function (i) {
             return i.name;
           }), qualifier);
           throw new Error(stringifyDiagnose(_diagnose));
         } else {
-          var _diagnose2 = createDiagnose(DiagnoseCode.CO10009, definition.cocoid, descendantList.map(function (i) {
+          var _diagnose2 = createDiagnose(DiagnoseCode.CO10009, definition.id, descendantList.map(function (i) {
             return i.name;
           }));
           throw new Error(stringifyDiagnose(_diagnose2));
@@ -2965,7 +2965,7 @@ var IocComponentFactory = /*#__PURE__*/function () {
         var qualifier = opt.qualifier;
         if (!qualifier) {
           // 如果没有指定，尝试从配置中获取
-          qualifier = application.propertiesConfig.getValue("".concat(targetDefinition.cocoid, ".qualifier"));
+          qualifier = application.propertiesConfig.getValue("".concat(targetDefinition.id, ".qualifier"));
         }
         // 真正实例化的类定义
         var instantiateDefinition = application.iocComponentDefinition.getInstantiateDefinition(classOrId, qualifier);
@@ -3204,7 +3204,7 @@ function doBuildIocComponentDefinition(metadataRepository, componentMetadataClas
             // 取组件装饰器的@scope装饰器
             scope = getComponentDecoratorScope(componentMetadata, metaMetadata, componentMetadataClass);
           }
-          iocComponentDefinition.addDefinition(beDecoratedCls, beDecoratedCls.$$cocoId, scope === exports.SCOPE.Singleton);
+          iocComponentDefinition.addDefinition(beDecoratedCls, beDecoratedCls.$$id, scope === exports.SCOPE.Singleton);
         } else {
           var methods = metadataRepository.listMethodByMetadataCls(beDecoratedCls, Component);
           var _iterator2 = _createForOfIteratorHelper(methods),
@@ -3216,7 +3216,7 @@ function doBuildIocComponentDefinition(metadataRepository, componentMetadataClas
               // TODO: @component()装饰器的参数能否在 ioc 组件中定义了，没有定义都是有问题的
               var scopeMetas = metadataRepository.listMethodKindMetadata(beDecoratedCls, method, Scope);
               // TODO: 添加校验是否有@cocoid装饰器；
-              var cocoidMetas = metadataRepository.listMethodKindMetadata(beDecoratedCls, method, Cocoid);
+              var cocoidMetas = metadataRepository.listMethodKindMetadata(beDecoratedCls, method, Id);
               iocComponentDefinition.addDefinition(componentMetas[0].value, cocoidMetas[0].value, !scopeMetas.length || scopeMetas[0].value === exports.SCOPE.Singleton, {
                 configurationCls: beDecoratedCls,
                 method: method
@@ -3321,7 +3321,7 @@ var Application = /*#__PURE__*/function () {
     _classCallCheck(this, Application);
     _defineProperty(this, "componentMetadataClass", void 0);
     _defineProperty(this, "metadataRepository", void 0);
-    _defineProperty(this, "cocoidClassMap", void 0);
+    _defineProperty(this, "idClassMap", void 0);
     _defineProperty(this, "propertiesConfig", void 0);
     _defineProperty(this, "iocComponentDefinition", void 0);
     _defineProperty(this, "iocComponentFactory", void 0);
@@ -3338,10 +3338,10 @@ var Application = /*#__PURE__*/function () {
       // 用装饰器参数初始化元数据数据
       var _initMetadataModule = initMetadataModule(getDecoratorParam()),
         metadataRepository = _initMetadataModule.metadataRepository,
-        cocoidClassMap = _initMetadataModule.cocoidClassMap,
+        idClassMap = _initMetadataModule.idClassMap,
         componentMetadataClass = _initMetadataModule.componentMetadataClass;
       this.metadataRepository = metadataRepository;
-      this.cocoidClassMap = cocoidClassMap;
+      this.idClassMap = idClassMap;
       this.componentMetadataClass = componentMetadataClass;
       // 用元数据信息初始化ioc组件数据
       var _initIocComponentModu = initIocComponentModule(this.metadataRepository, this.componentMetadataClass),
@@ -3356,7 +3356,7 @@ var Application = /*#__PURE__*/function () {
     key: "destructor",
     value: function destructor() {
       destructorIocComponentModule(this.iocComponentDefinition, this.iocComponentFactory);
-      clearMetadataModule(this.metadataRepository, this.cocoidClassMap, this.componentMetadataClass);
+      clearMetadataModule(this.metadataRepository, this.idClassMap, this.componentMetadataClass);
       clearDecoratorParamModule();
     }
   }, {
@@ -3397,7 +3397,7 @@ var Application = /*#__PURE__*/function () {
   }, {
     key: "getMetaClassById",
     value: function getMetaClassById(id) {
-      return this.cocoidClassMap.getMetaClassById(id);
+      return this.idClassMap.getMetaClassById(id);
     }
     /**
      * 启动所有配置boot的组件
@@ -3436,7 +3436,7 @@ new (_Bind2 = (_Bind3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Bind]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Bind'), _initClass$o();
+    _this = _callSuper(this, _Class, [_Bind]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Bind'), _initClass$o();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3467,7 +3467,7 @@ new (_Cookie2 = (_Cookie3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Cookie]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Cookie'), _initClass$n();
+    _this = _callSuper(this, _Class, [_Cookie]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Cookie'), _initClass$n();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3730,7 +3730,7 @@ new (_View2 = (_View3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_View]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'View'), _initClass$m();
+    _this = _callSuper(this, _Class, [_View]), _defineProperty(_assertThisInitialized(_this), "$$id", 'View'), _initClass$m();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3757,7 +3757,7 @@ new (_Layout2 = (_Layout3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Layout]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Layout'), _initClass$l();
+    _this = _callSuper(this, _Class, [_Layout]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Layout'), _initClass$l();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3784,7 +3784,7 @@ new (_LocalStorage2 = (_LocalStorage3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_LocalStorage]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'LocalStorage'), _initClass$k();
+    _this = _callSuper(this, _Class, [_LocalStorage]), _defineProperty(_assertThisInitialized(_this), "$$id", 'LocalStorage'), _initClass$k();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3811,7 +3811,7 @@ new (_Memoized2 = (_Memoized3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Memoized]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Memoized'), _initClass$j();
+    _this = _callSuper(this, _Class, [_Memoized]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Memoized'), _initClass$j();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3902,7 +3902,7 @@ new (_Page2 = (_Page3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Page]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Page'), _initClass$i();
+    _this = _callSuper(this, _Class, [_Page]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Page'), _initClass$i();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -3931,7 +3931,7 @@ new (_Reactive2 = (_Reactive3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Reactive]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Reactive'), _initClass$h();
+    _this = _callSuper(this, _Class, [_Reactive]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Reactive'), _initClass$h();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4043,7 +4043,7 @@ new (_Ref2 = (_Ref3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Ref]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Ref'), _initClass$g();
+    _this = _callSuper(this, _Class, [_Ref]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Ref'), _initClass$g();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4076,7 +4076,7 @@ new (_Refs2 = (_Refs3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Refs]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Refs'), _initClass$f();
+    _this = _callSuper(this, _Class, [_Refs]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Refs'), _initClass$f();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4107,7 +4107,7 @@ new (_SessionStorage2 = (_SessionStorage3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_SessionStorage]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'SessionStorage'), _initClass$e();
+    _this = _callSuper(this, _Class, [_SessionStorage]), _defineProperty(_assertThisInitialized(_this), "$$id", 'SessionStorage'), _initClass$e();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4134,7 +4134,7 @@ new (_Store2 = (_Store3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Store]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Store'), _initClass$d();
+    _this = _callSuper(this, _Class, [_Store]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Store'), _initClass$d();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4256,7 +4256,7 @@ new (_Router2$1 = (_Router3$1 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Router$1]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Router'), _initClass$c();
+    _this = _callSuper(this, _Class, [_Router$1]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Router'), _initClass$c();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4287,7 +4287,7 @@ new (_Route2$1 = (_Route3$1 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_Route$1]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'Route'), _initClass$b();
+    _this2 = _callSuper(this, _Class, [_Route$1]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'Route'), _initClass$b();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -4314,7 +4314,7 @@ new (_Router2 = (_Router3 = /*#__PURE__*/_createClass(function Router() {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Router]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Router'), _initClass$a();
+    _this = _callSuper(this, _Class, [_Router]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Router'), _initClass$a();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4453,7 +4453,7 @@ new (_Route2 = (_Route3 = /*#__PURE__*/_createClass(function Route() {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Route]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Route'), _initClass$9();
+    _this = _callSuper(this, _Class, [_Route]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Route'), _initClass$9();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4475,7 +4475,7 @@ new (_Render2$1 = (_Render3$1 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Render$1]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Render'), _initClass$8();
+    _this = _callSuper(this, _Class, [_Render$1]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Render'), _initClass$8();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -4497,7 +4497,7 @@ new (_Render2 = (_Render3 = /*#__PURE__*/_createClass(function Render() {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Render]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Render'), _initClass$7();
+    _this = _callSuper(this, _Class, [_Render]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Render'), _initClass$7();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8745,7 +8745,7 @@ new (_WebRender2 = (_WebRender3 = /*#__PURE__*/function (_Render) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_WebRender]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'WebRender'), _initClass$6();
+    _this2 = _callSuper(this, _Class, [_WebRender]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'WebRender'), _initClass$6();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -8810,7 +8810,7 @@ new (_HistoryRouter2 = (_HistoryRouter3 = /*#__PURE__*/function (_Router) {
   function _Class() {
     var _this2;
     _classCallCheck(this, _Class);
-    _this2 = _callSuper(this, _Class, [_HistoryRouter]), _defineProperty(_assertThisInitialized(_this2), "$$cocoId", 'HistoryRouter'), _initClass$5();
+    _this2 = _callSuper(this, _Class, [_HistoryRouter]), _defineProperty(_assertThisInitialized(_this2), "$$id", 'HistoryRouter'), _initClass$5();
     return _this2;
   }
   _inherits(_Class, _identity2);
@@ -8835,7 +8835,7 @@ new (_Util2 = (_Util3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Util]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Util'), _initClass$4();
+    _this = _callSuper(this, _Class, [_Util]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Util'), _initClass$4();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8862,7 +8862,7 @@ new (_Api2 = (_Api3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Api]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Api'), _initClass$3();
+    _this = _callSuper(this, _Class, [_Api]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Api'), _initClass$3();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8889,7 +8889,7 @@ new (_Flow2 = (_Flow3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_Flow]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'Flow'), _initClass$2();
+    _this = _callSuper(this, _Class, [_Flow]), _defineProperty(_assertThisInitialized(_this), "$$id", 'Flow'), _initClass$2();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8917,7 +8917,7 @@ new (_GlobalData2 = (_GlobalData3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_GlobalData]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'GlobalData'), _initClass$1();
+    _this = _callSuper(this, _Class, [_GlobalData]), _defineProperty(_assertThisInitialized(_this), "$$id", 'GlobalData'), _initClass$1();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8944,7 +8944,7 @@ new (_WebApplication2 = (_WebApplication3 = /*#__PURE__*/function (_Metadata) {
   function _Class() {
     var _this;
     _classCallCheck(this, _Class);
-    _this = _callSuper(this, _Class, [_WebApplication]), _defineProperty(_assertThisInitialized(_this), "$$cocoId", 'WebApplication'), _initClass();
+    _this = _callSuper(this, _Class, [_WebApplication]), _defineProperty(_assertThisInitialized(_this), "$$id", 'WebApplication'), _initClass();
     return _this;
   }
   _inherits(_Class, _identity2);
@@ -8959,7 +8959,6 @@ exports.Application = Application;
 exports.Autowired = Autowired;
 exports.Bind = Bind;
 exports.Children = Children;
-exports.Cocoid = Cocoid;
 exports.Component = Component;
 exports.Configuration = Configuration;
 exports.ConstructorParam = ConstructorParam;
@@ -8967,6 +8966,7 @@ exports.Cookie = Cookie;
 exports.Flow = Flow;
 exports.GlobalData = GlobalData;
 exports.HistoryRouter = _HistoryRouter$1;
+exports.Id = Id;
 exports.KindClass = KindClass;
 exports.KindField = KindField;
 exports.KindMethod = KindMethod;
@@ -8999,7 +8999,6 @@ exports.WebRender = _WebRender$1;
 exports.api = api;
 exports.autowired = autowired;
 exports.bind = bind;
-exports.cocoid = cocoid;
 exports.component = component;
 exports.configuration = configuration;
 exports.constructorParam = constructorParam;
@@ -9009,6 +9008,7 @@ exports.createPlaceholderDecoratorExp = createPlaceholderDecoratorExp;
 exports.defineReactive = defineReactive;
 exports.flow = flow;
 exports.globalData = globalData;
+exports.id = id$2;
 exports.jsx = jsx;
 exports.jsxs = jsx;
 exports.layout = layout;

package/dist/index.d.ts

@@ -15,7 +15,7 @@ export declare const api: () => Decorator<ClassDecoratorContext>;
 export declare class Application {
     componentMetadataClass: ComponentMetadataClass;
     metadataRepository: MetadataRepository;
-    cocoidClassMap: CocoidClassMap;
+    idClassMap: IdClassMap;
     propertiesConfig: PropertiesConfig;
     iocComponentDefinition: IocComponentDefinition;
     iocComponentFactory: IocComponentFactory;
@@ -61,7 +61,7 @@ export declare class Application {
 declare class Application_2 {
     componentMetadataClass: ComponentMetadataClass_2;
     metadataRepository: MetadataRepository_2;
-    cocoidClassMap: CocoidClassMap_2;
+    idClassMap: IdClassMap_2;
     propertiesConfig: PropertiesConfig_2;
     iocComponentDefinition: IocComponentDefinition_2;
     iocComponentFactory: IocComponentFactory_2;
@@ -107,7 +107,7 @@ declare class Application_2 {
 declare class Application_3 {
     componentMetadataClass: ComponentMetadataClass_3;
     metadataRepository: MetadataRepository_3;
-    cocoidClassMap: CocoidClassMap_3;
+    idClassMap: IdClassMap_3;
     propertiesConfig: PropertiesConfig_3;
     iocComponentDefinition: IocComponentDefinition_3;
     iocComponentFactory: IocComponentFactory_3;
@@ -193,63 +193,6 @@ export declare const Children: {
     forEach: (children: any, func: any, context: any) => void;
 };
 
-/**
- * @public
- */
-export declare class Cocoid extends Metadata {
-    value: string;
-}
-
-export declare const cocoid: (cocoid: string) => Decorator<ClassMethodDecoratorContext>;
-
-declare class CocoidClassMap {
-    private cocoidClassMap;
-    /**
-     * * 保存元数据类本身，方便运行是通过id获取元数据类
-     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
-     */
-    constructor(metaMetadataMap: Map<Class<Metadata>, MetaMetadata>);
-    /**
-     * * 根据cocoId获取元数据类
-     * * @param cocoId 元数据类id
-     * * @returns 元数据类
-     */
-    getMetaClassById(cocoId: string): Class<Metadata>;
-    destructor(): void;
-}
-
-declare class CocoidClassMap_2 {
-    private cocoidClassMap;
-    /**
-     * * 保存元数据类本身，方便运行是通过id获取元数据类
-     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
-     */
-    constructor(metaMetadataMap: Map<Class<Metadata_2>, MetaMetadata_2>);
-    /**
-     * * 根据cocoId获取元数据类
-     * * @param cocoId 元数据类id
-     * * @returns 元数据类
-     */
-    getMetaClassById(cocoId: string): Class<Metadata_2>;
-    destructor(): void;
-}
-
-declare class CocoidClassMap_3 {
-    private cocoidClassMap;
-    /**
-     * * 保存元数据类本身，方便运行是通过id获取元数据类
-     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
-     */
-    constructor(metaMetadataMap: Map<Class<Metadata_4>, MetaMetadata_3>);
-    /**
-     * * 根据cocoId获取元数据类
-     * * @param cocoId 元数据类id
-     * * @returns 元数据类
-     */
-    getMetaClassById(cocoId: string): Class<Metadata_4>;
-    destructor(): void;
-}
-
 /**
  * Component不添加@scope(SCOPE.Singleton)的原因：
  * 因为不设置默认就是singleton，还可以避免 scope <-> target 循环依赖的问题
@@ -585,11 +528,68 @@ export declare class HistoryRouter extends Router {
     navigateTo(url: string): void;
 }
 
-declare type Id = string;
+/**
+ * @public
+ */
+export declare class Id extends Metadata {
+    value: string;
+}
+
+export declare const id: (id: string) => Decorator<ClassMethodDecoratorContext>;
 
 declare type Id_2 = string;
 
-declare type Id_3 = string;
+declare type Id_2_2 = string;
+
+declare type Id_2_3 = string;
+
+declare class IdClassMap {
+    private idClassMap;
+    /**
+     * * 保存元数据类本身，方便运行是通过id获取元数据类
+     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
+     */
+    constructor(metaMetadataMap: Map<Class<Metadata>, MetaMetadata>);
+    /**
+     * * 根据cocoId获取元数据类
+     * * @param id 元数据类id
+     * * @returns 元数据类
+     */
+    getMetaClassById(id: string): Class<Metadata>;
+    destructor(): void;
+}
+
+declare class IdClassMap_2 {
+    private idClassMap;
+    /**
+     * * 保存元数据类本身，方便运行是通过id获取元数据类
+     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
+     */
+    constructor(metaMetadataMap: Map<Class<Metadata_2>, MetaMetadata_2>);
+    /**
+     * * 根据cocoId获取元数据类
+     * * @param id 元数据类id
+     * * @returns 元数据类
+     */
+    getMetaClassById(id: string): Class<Metadata_2>;
+    destructor(): void;
+}
+
+declare class IdClassMap_3 {
+    private idClassMap;
+    /**
+     * * 保存元数据类本身，方便运行是通过id获取元数据类
+     * * @param metaMetadataMap 元数据类映射map，key是元数据类，value是元数据类的元数据列表
+     */
+    constructor(metaMetadataMap: Map<Class<Metadata_4>, MetaMetadata_3>);
+    /**
+     * * 根据cocoId获取元数据类
+     * * @param id 元数据类id
+     * * @returns 元数据类
+     */
+    getMetaClassById(id: string): Class<Metadata_4>;
+    destructor(): void;
+}
 
 declare interface IGetter {
     (): any;
@@ -603,7 +603,7 @@ declare interface IGetter {
  * 3. 项目中通过@component方法装饰注册的组件
  */
 declare interface IocComDef<T> {
-    cocoid: string;
+    id: string;
     cls: Class<T>;
     isSingleton: boolean;
     instantiateType: 'new' | 'method';
@@ -621,7 +621,7 @@ declare interface IocComDef<T> {
  * 3. 项目中通过@component方法装饰注册的组件
  */
 declare interface IocComDef_2<T> {
-    cocoid: string;
+    id: string;
     cls: Class<T>;
     isSingleton: boolean;
     instantiateType: 'new' | 'method';
@@ -639,7 +639,7 @@ declare interface IocComDef_2<T> {
  * 3. 项目中通过@component方法装饰注册的组件
  */
 declare interface IocComDef_3<T> {
-    cocoid: string;
+    id: string;
     cls: Class<T>;
     isSingleton: boolean;
     instantiateType: 'new' | 'method';
@@ -650,10 +650,10 @@ declare interface IocComDef_3<T> {
 }
 
 declare class IocComponentDefinition {
-    idDefinitionMap: Map<Id, IocComDef<any>>;
+    idDefinitionMap: Map<Id_2, IocComDef<any>>;
     clsDefinitionMap: Map<Class<any>, IocComDef<any>>;
-    newIocComponentDefinition<T>(cocoid: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef<T>;
-    addDefinition(cls: Class<any>, cocoid: string, isSingleton: boolean, methodInstantiateOpts?: {
+    newIocComponentDefinition<T>(id: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef<T>;
+    addDefinition(cls: Class<any>, id: string, isSingleton: boolean, methodInstantiateOpts?: {
         configurationCls: Class<any>;
         method: string;
     }): void;
@@ -663,17 +663,17 @@ declare class IocComponentDefinition {
      * @param qualifier 如果存在多个后端类，需要通过qualifier指定具体的类id
      * @returns 真正会实例化的类定义
      */
-    getInstantiateDefinition(ClsOrId: Class<any> | Id, qualifier?: string): IocComDef<any>;
-    getDefinition(ClsOrId: Class<any> | Id): IocComDef<any>;
-    existDefinition(ClsOrId: Class<any> | Id): boolean;
+    getInstantiateDefinition(ClsOrId: Class<any> | Id_2, qualifier?: string): IocComDef<any>;
+    getDefinition(ClsOrId: Class<any> | Id_2): IocComDef<any>;
+    existDefinition(ClsOrId: Class<any> | Id_2): boolean;
     destructor(): void;
 }
 
 declare class IocComponentDefinition_2 {
-    idDefinitionMap: Map<Id_2, IocComDef_2<any>>;
+    idDefinitionMap: Map<Id_2_2, IocComDef_2<any>>;
     clsDefinitionMap: Map<Class<any>, IocComDef_2<any>>;
-    newIocComponentDefinition<T>(cocoid: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef_2<T>;
-    addDefinition(cls: Class<any>, cocoid: string, isSingleton: boolean, methodInstantiateOpts?: {
+    newIocComponentDefinition<T>(id: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef_2<T>;
+    addDefinition(cls: Class<any>, id: string, isSingleton: boolean, methodInstantiateOpts?: {
         configurationCls: Class<any>;
         method: string;
     }): void;
@@ -683,17 +683,17 @@ declare class IocComponentDefinition_2 {
      * @param qualifier 如果存在多个后端类，需要通过qualifier指定具体的类id
      * @returns 真正会实例化的类定义
      */
-    getInstantiateDefinition(ClsOrId: Class<any> | Id_2, qualifier?: string): IocComDef_2<any>;
-    getDefinition(ClsOrId: Class<any> | Id_2): IocComDef_2<any>;
-    existDefinition(ClsOrId: Class<any> | Id_2): boolean;
+    getInstantiateDefinition(ClsOrId: Class<any> | Id_2_2, qualifier?: string): IocComDef_2<any>;
+    getDefinition(ClsOrId: Class<any> | Id_2_2): IocComDef_2<any>;
+    existDefinition(ClsOrId: Class<any> | Id_2_2): boolean;
     destructor(): void;
 }
 
 declare class IocComponentDefinition_3 {
-    idDefinitionMap: Map<Id_3, IocComDef_3<any>>;
+    idDefinitionMap: Map<Id_2_3, IocComDef_3<any>>;
     clsDefinitionMap: Map<Class<any>, IocComDef_3<any>>;
-    newIocComponentDefinition<T>(cocoid: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef_3<T>;
-    addDefinition(cls: Class<any>, cocoid: string, isSingleton: boolean, methodInstantiateOpts?: {
+    newIocComponentDefinition<T>(id: string, cls: Class<T>, isSingleton: boolean, instantiateType: 'new' | 'method'): IocComDef_3<T>;
+    addDefinition(cls: Class<any>, id: string, isSingleton: boolean, methodInstantiateOpts?: {
         configurationCls: Class<any>;
         method: string;
     }): void;
@@ -703,9 +703,9 @@ declare class IocComponentDefinition_3 {
      * @param qualifier 如果存在多个后端类，需要通过qualifier指定具体的类id
      * @returns 真正会实例化的类定义
      */
-    getInstantiateDefinition(ClsOrId: Class<any> | Id_3, qualifier?: string): IocComDef_3<any>;
-    getDefinition(ClsOrId: Class<any> | Id_3): IocComDef_3<any>;
-    existDefinition(ClsOrId: Class<any> | Id_3): boolean;
+    getInstantiateDefinition(ClsOrId: Class<any> | Id_2_3, qualifier?: string): IocComDef_3<any>;
+    getDefinition(ClsOrId: Class<any> | Id_2_3): IocComDef_3<any>;
+    existDefinition(ClsOrId: Class<any> | Id_2_3): boolean;
     destructor(): void;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocojs/mvc",
-  "version": "0.0.1-alpha.4",
+  "version": "0.0.1-alpha.5",
   "description": "由装饰器驱动，快速构建可扩展的 Web 应用。",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",