@kaokei/di 1.0.21 → 1.0.25

package/dist/index.esm.js

@@ -1,8 +1,4 @@
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -16,53 +12,77 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
+
+function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /**
  * @kaokei/di
- * jsbridge for iframes or windows by window.postMessage
+ * Tiny di library depend on typescript and reflect-metadata
  *
- * @version 1.0.21
+ * @version 1.0.25
  * @author kaokei
  * @license MIT
  * @link https://github.com/kaokei/di
  */
-export { default as autobind } from 'autobind-decorator';
-var DESIGN_PARAM_TYPES = 'design:paramtypes'; // ts自带的类的构造函数的参数的类型信息的key
-
-var SERVICE_PARAM_TYPES = 'service:paramtypes'; // 构造函数原始的类型数据，可能会被@Inject等覆盖
-
-var SERVICE_INJECTED_PARAMS = 'service:injected:params'; // 构造函数使用@Inject注入的数据
-
-var SERVICE_INJECTED_PROPS = 'service:injected:props'; // @Inject注入的properties
-
 var DECORATOR_KEYS = {
+  // ts自带的类的实例属性的类型的key
+  DESIGN_PROPERTY_TYPE: 'design:type',
+  // ts自带的类的构造函数的参数的类型信息的key
+  DESIGN_PARAM_TYPES: 'design:paramtypes',
+  // 记录构造函数原始的类型数据的key，其实就是转存了DESIGN_PARAM_TYPES对应的数据
+  SERVICE_PARAM_TYPES: 'service:paramtypes',
+  // 记录构造函数参数装饰器对应的数据的key
+  SERVICE_INJECTED_PARAMS: 'service:injected:params',
+  // 记录实例属性装饰器对应的数据的key
+  SERVICE_INJECTED_PROPS: 'service:injected:props',
+  // Inject装饰器的key
   INJECT: Symbol('inject'),
+  // Injectable装饰器的key
   INJECTABLE: Symbol('injectable'),
+  // Self装饰器的key
   SELF: 'self',
+  // Skip装饰器的key
   SKIP_SELF: 'skip',
-  OPTIONAL: 'optional',
-  DEFAULT_VALUE: 'defaultValue'
+  // Optional装饰器的key
+  OPTIONAL: 'optional'
 };
 var SERVICE_STATUS = {
   INITING: Symbol('initing'),
   CONSTRUCTED: Symbol('constructed'),
-  MERGED: Symbol('merged'),
-  INITED: Symbol('inited')
-}; // 以下是error message常量
-
-var ERROR_CIRCULAR_DEPENDENCY = 'CIRCULAR DEPENDENCY DETECTED. PLEASE FIX IT MANUALLY.';
-var ERROR_DISABLE_MULTIPLE_INJECTABLE = 'Use multiple @Injectable on same class is not valid.';
-var ERROR_TOKEN_NOT_FOUND = 'Token not found.';
-var ERROR_INJECT_NOT_VALID = "You may forget to use @Inject on class property or @Injects's parameter is undefined.";
-var ERROR_PROVIDER_NOT_VALID = "Provider is not valid.";
+  MERGED: Symbol('merged')
+};
 /**
+ * 这里记录不同的装饰器的参数的含义
+ *
  * class decorator:
  *   只有一个参数：构造函数
  * property decorator:
@@ -80,42 +100,79 @@ var ERROR_PROVIDER_NOT_VALID = "Provider is not valid.";
  *   实例访问器：原型, 方法名, 属性描述符
  */
 
-function createPropertyDecorator(decoratorKey, defaultValue) {
+/**
+ * 创建装饰器的高阶函数
+ * 装饰器的通用逻辑就是通过Reflect记录到全局的Map中
+ * 所以可以抽象出一个通用逻辑，这里需要注意对Inject装饰器有特殊判断
+ *
+ * @param {(string | symbol)} decoratorKey 代表某个装饰器的名称
+ * @param {*} [defaultValue] 该装饰器函数的默认参数
+ * @return {*} 一个装饰器
+ */
+
+function createDecorator(decoratorKey, defaultValue) {
+  // 因为装饰器本身作为一个函数是有参数的，此处的decoratorValue就是实际使用装饰器的实参
   return function (decoratorValue) {
+    // 目前的装饰器只支持类的构造函数参数装饰器和类的实例属性装饰器
+    // target可能是构造函数或者类的原型
+    // 如果target是构造函数，targetKey是undefined，index是参数的位置下标
+    // 如果target是原型，targetKey是属姓名，index是undefined
     return function (target, targetKey, index) {
-      var isParameterDecorator = typeof index === 'number';
-      var Ctor = isParameterDecorator ? target : target.constructor;
-      var key = index !== undefined && isParameterDecorator ? index : targetKey;
-      var metadataKey = isParameterDecorator ? SERVICE_INJECTED_PARAMS : SERVICE_INJECTED_PROPS;
+      // 如果index是number，那么代表是构造函数的参数的装饰器
+      var isParameterDecorator = typeof index === 'number'; // 统一把装饰器数据绑定到构造函数上，后续获取数据比较方便
+
+      var Ctor = isParameterDecorator ? target : target.constructor; // 如果是构造函数的参数装饰器，取参数位置下标，否则取实例属性的属性名
+
+      var key = isParameterDecorator ? index : targetKey; // 区分构造函数的参数装饰器和实例属性的装饰器
+      // 分别记录到全局Map的不同位置，metadataKey不一样
+
+      var metadataKey = isParameterDecorator ? DECORATOR_KEYS.SERVICE_INJECTED_PARAMS : DECORATOR_KEYS.SERVICE_INJECTED_PROPS; // 这里是一个大对象，对应的key是metadataKey
+      // 所以全局Map中有两个不同的metadataKey，以及对应的数据对象
+      // 如果是构造函数参数装饰器，这个对象中的key是参数位置下标
+      // 如果是实例属性装饰器，这个对象中的key是属性名
+
       var paramsOrPropertiesMetadata = Reflect.getMetadata(metadataKey, Ctor) || {}; // 每个参数或者实例属性都可以有多个装饰器
+      // 所以paramsOrPropertiesMetadata这个大对象的每个key对应的value都是一个数组
+      // 该数组中的每一个元素是一个对象，保存着每一个装饰器的数据
 
       var paramOrPropertyMetadata = paramsOrPropertiesMetadata[key] || [];
       var metadata = {
+        // 装饰器的名称
         key: decoratorKey,
-        value: decoratorValue || defaultValue
+        // 装饰器的值，即装饰器函数的实参
+        // 很多装饰器具有默认值，可以不提供实参，而是使用默认值
+        value: decoratorValue === void 0 ? defaultValue : decoratorValue
       };
 
-      if (decoratorKey === DECORATOR_KEYS.INJECT) {
-        if (!decoratorValue) {
-          throw new Error('没有提供Inject Key');
+      if (!isParameterDecorator) {
+        if (decoratorKey === DECORATOR_KEYS.INJECT) {
+          if (decoratorValue === void 0) {
+            // 是实例属性装饰器，且是Inject装饰器，且没有指定参数
+            // 需要获取默认的类型数据
+            metadata.value = Reflect.getMetadata(DECORATOR_KEYS.DESIGN_PROPERTY_TYPE, target, targetKey);
+          }
         }
-      }
+      } // 把当前装饰器的数据对象放到数组中
+
+
+      paramOrPropertyMetadata.push(metadata); // 关联这个数组和对应的key
+
+      paramsOrPropertiesMetadata[key] = paramOrPropertyMetadata; // 再把整个大对象放到全局Map中
 
-      paramOrPropertyMetadata.push(metadata);
-      paramsOrPropertiesMetadata[key] = paramOrPropertyMetadata;
       Reflect.defineMetadata(metadataKey, paramsOrPropertiesMetadata, Ctor);
     };
   };
 } // 可以使用在类构造函数的参数中和类的实例属性中
 
 
-var Inject = createPropertyDecorator(DECORATOR_KEYS.INJECT); // 指定只在当前injector中寻找服务
+var Inject = createDecorator(DECORATOR_KEYS.INJECT); // 指定只在当前injector中寻找服务
 
-var Self = createPropertyDecorator(DECORATOR_KEYS.SELF, true); // 指定跳过当前injector寻找服务
+var Self = createDecorator(DECORATOR_KEYS.SELF, true); // 指定跳过当前injector寻找服务
 
-var Skip = createPropertyDecorator(DECORATOR_KEYS.SKIP_SELF, true); // 指定服务是可选的，找不到服务时返回undefined，否则抛出异常
+var Skip = createDecorator(DECORATOR_KEYS.SKIP_SELF, true); // 指定服务是可选的，找不到服务时返回undefined，否则抛出异常
+// 其实应该说是默认情况下找不到服务时，会抛出异常，除非明确指定是optional的
 
-var Optional = createPropertyDecorator(DECORATOR_KEYS.OPTIONAL, true);
+var Optional = createDecorator(DECORATOR_KEYS.OPTIONAL, true);
 /**
  * 表明服务可注入
  * 主要工作就是收集构造函数的参数类型信息
@@ -126,15 +183,15 @@ var Optional = createPropertyDecorator(DECORATOR_KEYS.OPTIONAL, true);
 
 function Injectable() {
   return function (target) {
-    if (Reflect.hasOwnMetadata(SERVICE_PARAM_TYPES, target)) {
-      throw new Error(ERROR_DISABLE_MULTIPLE_INJECTABLE);
-    }
+    // 标记这个类可以注入
+    Reflect.defineMetadata(DECORATOR_KEYS.INJECTABLE, true, target); // 获取ts编译器默认的类型数据
+    // 经过测试，如果是基本类型string、number、boolean，那么会变成相对应的构造函数String，Number，Boolean
+    // 如果只是指定了interface类型，那么会变成Object构造函数
 
-    var types = Reflect.getMetadata(DESIGN_PARAM_TYPES, target) || []; // 存储构造函数的类型信息
+    var types = Reflect.getMetadata(DECORATOR_KEYS.DESIGN_PARAM_TYPES, target) || []; // 存储构造函数的类型信息
+    // 这里只是转存了一下数据，并没有特殊逻辑
 
-    Reflect.defineMetadata(SERVICE_PARAM_TYPES, types, target); // 标记这个类可以注入
-
-    Reflect.defineMetadata(DECORATOR_KEYS.INJECTABLE, true, target);
+    Reflect.defineMetadata(DECORATOR_KEYS.SERVICE_PARAM_TYPES, types, target);
     return target;
   };
 }
@@ -166,6 +223,122 @@ function resolveForwardRef(type) {
   return isForwardRef(type) ? type() : type;
 }
 
+var CircularDependencyError = /*#__PURE__*/function (_Error) {
+  _inherits(CircularDependencyError, _Error);
+
+  var _super = _createSuper(CircularDependencyError);
+
+  function CircularDependencyError(provider, options) {
+    var _this;
+
+    _classCallCheck(this, CircularDependencyError);
+
+    _this = _super.call(this);
+
+    _defineProperty(_assertThisInitialized(_this), "name", 'CIRCULAR_DEPENDENCY_ERROR');
+
+    _defineProperty(_assertThisInitialized(_this), "message", _this.name);
+
+    var tokenArr = [provider.provide];
+    var currentProvider = options === null || options === void 0 ? void 0 : options.provider;
+
+    while (currentProvider && currentProvider.provide) {
+      tokenArr.push(currentProvider.provide);
+      currentProvider = currentProvider.parent;
+    }
+
+    var tokenListText = tokenArr.join(' <-- ');
+    _this.message = "CIRCULAR DEPENDENCY DETECTED. PLEASE FIX IT MANUALLY. \n ".concat(tokenListText);
+    return _this;
+  }
+
+  return CircularDependencyError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
+var InjectFailedError = /*#__PURE__*/function (_Error2) {
+  _inherits(InjectFailedError, _Error2);
+
+  var _super2 = _createSuper(InjectFailedError);
+
+  function InjectFailedError(injectMeta, ClassName, key, paramType) {
+    var _this2;
+
+    _classCallCheck(this, InjectFailedError);
+
+    _this2 = _super2.call(this);
+
+    _defineProperty(_assertThisInitialized(_this2), "name", 'INJECT_FAILED_ERROR');
+
+    _defineProperty(_assertThisInitialized(_this2), "message", _this2.name);
+
+    if (paramType) {
+      // 是构造函数的参数装饰器
+      if (injectMeta && injectMeta.value === Object) {
+        _this2.message = "CAN NOT USE OBJECT AS INJECTION TOKEN. PARAMETER ".concat(key, " OF CLASS ").concat(ClassName, ".");
+      } else if (paramType === Object) {
+        _this2.message = "CONSTRUCTOR PARAMETER TYPE IS OBJECT OR INTERFACE, MUST USE @INJECT TO SPECIFY INJECTION TOKEN. PARAMETER ".concat(key, " OF CLASS ").concat(ClassName, ".");
+      }
+    } else {
+      // 是属性装饰器
+      if (!injectMeta) {
+        _this2.message = "INJECT PROPERTY REQUIRE @INJECT() DECORATOR. PROPERTY ".concat(key, " OF CLASS ").concat(ClassName, ".");
+      } else if (injectMeta.value === Object) {
+        _this2.message = "CAN NOT USE OBJECT AS INJECTION TOKEN. PROPERTY ".concat(key, " OF CLASS ").concat(ClassName, ".");
+      }
+    }
+
+    return _this2;
+  }
+
+  return InjectFailedError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
+var ProviderNotValidError = /*#__PURE__*/function (_Error3) {
+  _inherits(ProviderNotValidError, _Error3);
+
+  var _super3 = _createSuper(ProviderNotValidError);
+
+  function ProviderNotValidError(provider) {
+    var _this3;
+
+    _classCallCheck(this, ProviderNotValidError);
+
+    _this3 = _super3.call(this);
+
+    _defineProperty(_assertThisInitialized(_this3), "name", 'PROVIDER_NOT_VALID_ERROR');
+
+    _defineProperty(_assertThisInitialized(_this3), "message", _this3.name);
+
+    _this3.message = "PROVIDER NOT VALID. ".concat(provider);
+    return _this3;
+  }
+
+  return ProviderNotValidError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
+var TokenNotFoundError = /*#__PURE__*/function (_Error4) {
+  _inherits(TokenNotFoundError, _Error4);
+
+  var _super4 = _createSuper(TokenNotFoundError);
+
+  function TokenNotFoundError(token) {
+    var _this4;
+
+    _classCallCheck(this, TokenNotFoundError);
+
+    _this4 = _super4.call(this);
+
+    _defineProperty(_assertThisInitialized(_this4), "name", 'TOKEN_NOT_FOUND_ERROR');
+
+    _defineProperty(_assertThisInitialized(_this4), "message", _this4.name);
+
+    _this4.message = "TOKEN IS NOT A INJECTABLE CLASS OR SKIP OUT OF ROOT INJECTOR. YOU CAN USE @Optional DECORATOR TO IGNORE THIS ERROR IF THIS SERVICE IS OPTIONAL. ".concat(token);
+    return _this4;
+  }
+
+  return TokenNotFoundError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
 var NOOP = function NOOP(n) {
   return n;
 }; // 第一步：准备构造函数的依赖对象
@@ -182,24 +355,21 @@ var Injector = /*#__PURE__*/function () {
 
     _classCallCheck(this, Injector);
 
-    _defineProperty(this, "providerMap", new Map());
-
-    _defineProperty(this, "parentToken", null);
-
     _defineProperty(this, "parent", void 0);
 
-    _defineProperty(this, "options", void 0);
+    _defineProperty(this, "providerMap", new Map());
+
+    _defineProperty(this, "beforeCacheHook", void 0);
 
-    _defineProperty(this, "postHook", void 0);
+    _defineProperty(this, "mergePropertyHook", void 0);
 
-    _defineProperty(this, "mergeHook", void 0);
+    // 引用父级Injector
+    this.parent = parent; // 在把服务实例放到缓存中之前，可以调用这个钩子让服务响应化
 
-    this.parent = parent;
-    this.options = options; // 在获取服务实例之后，在更新provider.useValue之前，使服务响应化
+    this.beforeCacheHook = options.beforeCacheHook || NOOP; // 在注入实例属性时，需要把属性merge到服务实例对象上，合并过程需要保持响应式
 
-    this.postHook = options.postHook || NOOP;
-    this.mergeHook = options.mergeHook || merge;
-    this.resolveProviders(providers);
+    this.mergePropertyHook = options.mergePropertyHook || merge;
+    this.addProviders(providers);
   }
 
   _createClass(Injector, [{
@@ -207,102 +377,242 @@ var Injector = /*#__PURE__*/function () {
     value: function get(token) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-      if (options.self) {
+      if (options.skip) {
+        if (this.parent) {
+          return this.parent.get(token, _objectSpread(_objectSpread({}, options), {}, {
+            skip: false
+          }));
+        } else {
+          if (!options.optional) {
+            throw new TokenNotFoundError(token);
+          }
+        }
+      } else if (options.self) {
         if (this.providerMap.has(token)) {
           var provider = this.providerMap.get(token);
 
           if (provider.status === SERVICE_STATUS.INITING) {
-            throw new Error("".concat(ERROR_CIRCULAR_DEPENDENCY, " ").concat(token, " and ").concat(this.parentToken, " depent on each other."));
+            throw new CircularDependencyError(provider, options);
           }
 
           return this.getServiceByProvider(provider, options);
         } else if (!this.parent && typeof token === 'function' && Reflect.getMetadata(DECORATOR_KEYS.INJECTABLE, token)) {
           // 如果当前Injector已经是根Injector
           // 就必须要考虑self的限制
-          return this.getServiceByClass(token, token);
-        } else {
-          if (DECORATOR_KEYS.OPTIONAL in options || DECORATOR_KEYS.DEFAULT_VALUE in options) {
-            return options.defaultValue;
-          } else {
-            throw new Error("".concat(token, " ").concat(ERROR_TOKEN_NOT_FOUND));
-          }
-        }
-      } else if (options.skip) {
-        options.skip = false;
+          var _provider = this.getProviderByToken(token);
 
-        if (this.parent) {
-          return this.parent.get(token, options);
+          return this.getServiceByProvider(_provider, options);
         } else {
-          if (DECORATOR_KEYS.OPTIONAL in options || DECORATOR_KEYS.DEFAULT_VALUE in options) {
-            return options.defaultValue;
-          } else {
-            throw new Error("".concat(token, " ").concat(ERROR_TOKEN_NOT_FOUND));
+          if (!options.optional) {
+            throw new TokenNotFoundError(token);
           }
         }
       } else if (this.providerMap.has(token)) {
-        var _provider = this.providerMap.get(token);
+        var _provider2 = this.providerMap.get(token);
 
-        if (_provider.status === SERVICE_STATUS.INITING) {
-          throw new Error("".concat(ERROR_CIRCULAR_DEPENDENCY, " ").concat(token, " and ").concat(this.parentToken, " depent on each other."));
+        if (_provider2.status === SERVICE_STATUS.INITING) {
+          throw new CircularDependencyError(_provider2, options);
         }
 
-        return this.getServiceByProvider(_provider, options);
+        return this.getServiceByProvider(_provider2, options);
       } else if (this.parent) {
         return this.parent.get(token, options);
       } else if (typeof token === 'function' && Reflect.getMetadata(DECORATOR_KEYS.INJECTABLE, token)) {
-        return this.getServiceByClass(token, token);
+        var _provider3 = this.getProviderByToken(token);
+
+        return this.getServiceByProvider(_provider3, options);
       } else {
-        if (DECORATOR_KEYS.OPTIONAL in options || DECORATOR_KEYS.DEFAULT_VALUE in options) {
-          return options.defaultValue;
-        } else {
-          throw new Error("".concat(token, " ").concat(ERROR_TOKEN_NOT_FOUND));
+        if (!options.optional) {
+          throw new TokenNotFoundError(token);
         }
       }
     }
     /**
-     * 获取构造函数的参数-返回数组
-     * @done
+     * 如果token对应的provider不存在
+     * 那么就创建一个
+     * 调用该方法之前需要保证token对应的provider已经存在或者token本身是一个可注入的类
+     *
      * @param {*} token
      * @return {*}
      * @memberof Injector
      */
 
+  }, {
+    key: "getProviderByToken",
+    value: function getProviderByToken(token) {
+      if (!this.providerMap.has(token)) {
+        this.addProvider(token);
+      }
+
+      return this.providerMap.get(token);
+    }
+    /**
+     * 通过provider直接获取service实例
+     *
+     * @param {*} provider
+     * @param {*} options
+     * @return {*}
+     * @memberof Injector
+     */
+
+  }, {
+    key: "getServiceByProvider",
+    value: function getServiceByProvider(provider, options) {
+      if ('useCacheValue' in provider) {
+        return provider.useCacheValue;
+      } else if ('useValue' in provider) {
+        return this.getServiceUseValueWithProvider(provider);
+      } else if (provider.useClass) {
+        return this.getServiceUseClassWithProvider(provider, options);
+      } else if (provider.useExisting) {
+        return this.getServiceUseExistingWithProvider(provider, options);
+      } else if (provider.useFactory) {
+        return this.getServiceUseFactoryWithProvider(provider, options);
+      } else {
+        throw new ProviderNotValidError(provider);
+      }
+    }
+    /**
+     * 通过useValue获取服务实例
+     *
+     * @param {*} provider
+     * @return {*}
+     * @memberof Injector
+     */
+
+  }, {
+    key: "getServiceUseValueWithProvider",
+    value: function getServiceUseValueWithProvider(provider) {
+      var cacheValue = this.beforeCacheHook(provider.useValue);
+      provider.useCacheValue = cacheValue;
+      return cacheValue;
+    }
+    /**
+     * 通过useClass获取服务实例
+     *
+     * @param {*} provider
+     * @param {*} options
+     * @return {*}
+     * @memberof Injector
+     */
+
+  }, {
+    key: "getServiceUseClassWithProvider",
+    value: function getServiceUseClassWithProvider(provider, options) {
+      provider.parent = options.provider;
+      provider.status = SERVICE_STATUS.INITING;
+      var ClassName = provider.useClass;
+      var params = this.getContructorParameters(ClassName, provider);
+      var cacheValue = this.beforeCacheHook(_construct(ClassName, _toConsumableArray(params)));
+      provider.useCacheValue = cacheValue;
+      provider.status = SERVICE_STATUS.CONSTRUCTED;
+      var properties = this.getInjectProperties(ClassName, provider);
+      this.mergePropertyHook(cacheValue, properties);
+      provider.status = SERVICE_STATUS.MERGED;
+      provider.parent = void 0;
+      return cacheValue;
+    }
+    /**
+     * 通过useExisting获取服务实例
+     *
+     * @param {*} provider
+     * @param {*} options
+     * @return {*}
+     * @memberof Injector
+     */
+
+  }, {
+    key: "getServiceUseExistingWithProvider",
+    value: function getServiceUseExistingWithProvider(provider, options) {
+      provider.parent = options.provider;
+      provider.status = SERVICE_STATUS.INITING;
+      var cacheValue = this.get(provider.useExisting, _objectSpread(_objectSpread({}, options), {}, {
+        provider: provider
+      }));
+      provider.useCacheValue = cacheValue;
+      provider.status = SERVICE_STATUS.CONSTRUCTED;
+      provider.parent = void 0;
+      return cacheValue;
+    }
+    /**
+     * 通过useFactory获取服务实例
+     *
+     * @param {*} provider
+     * @param {*} options
+     * @return {*}
+     * @memberof Injector
+     */
+
+  }, {
+    key: "getServiceUseFactoryWithProvider",
+    value: function getServiceUseFactoryWithProvider(provider, options) {
+      var _this5 = this;
+
+      provider.parent = options.provider;
+      provider.status = SERVICE_STATUS.INITING;
+      var deps = provider.deps || [];
+      var args = deps.map(function (dep) {
+        return _this5.get(dep, {
+          provider: provider
+        });
+      });
+      var serviceValue = provider.useFactory.apply(provider, _toConsumableArray(args));
+      var cacheValue = this.beforeCacheHook(serviceValue);
+      provider.useCacheValue = cacheValue;
+      provider.status = SERVICE_STATUS.CONSTRUCTED;
+      provider.parent = void 0;
+      return cacheValue;
+    }
+    /**
+     * 获取构造函数的参数-返回数组
+     *
+     * @param {*} ClassName
+     * @param {*} provider
+     * @return {*}
+     * @memberof Injector
+     */
+
   }, {
     key: "getContructorParameters",
-    value: function getContructorParameters(token) {
-      var _this = this;
+    value: function getContructorParameters(ClassName, provider) {
+      var _this6 = this;
 
-      var currentParentToken = this.parentToken;
-      this.parentToken = token;
-      var params = this.getContructorParametersMetas(token);
+      var params = this.getContructorParametersMetas(ClassName);
       var result = params.map(function (meta) {
-        return _this.get(meta.key, meta.value);
+        return _this6.get(meta.key, _objectSpread(_objectSpread({}, meta.value), {}, {
+          provider: provider
+        }));
       });
-      this.parentToken = currentParentToken;
       return result;
     }
     /**
      * 获取构造函数的参数的装饰器元数据
-     * @done
-     * @param {*} token
+     *
+     * @param {*} ClassName
      * @return {*}
      * @memberof Injector
      */
 
   }, {
     key: "getContructorParametersMetas",
-    value: function getContructorParametersMetas(token) {
+    value: function getContructorParametersMetas(ClassName) {
       // 构造函数的参数的类型数据-原始数据-是一个数组
-      var params = Reflect.getMetadata(SERVICE_PARAM_TYPES, token) || []; // 构造函数的参数的类型数据-通过@Inject等装饰器实现-是一个对象-key是数字-对应第几个参数的类型数据
+      var params = Reflect.getMetadata(DECORATOR_KEYS.SERVICE_PARAM_TYPES, ClassName) || []; // 构造函数的参数的类型数据-通过@Inject等装饰器实现-是一个对象-key是数字-对应第几个参数的类型数据
 
-      var propertiesMetadatas = Reflect.getMetadata(SERVICE_INJECTED_PARAMS, token) || {};
+      var propertiesMetadatas = Reflect.getMetadata(DECORATOR_KEYS.SERVICE_INJECTED_PARAMS, ClassName) || {};
       return params.map(function (paramType, index) {
         // 查找当前index对应的参数有没有使用装饰器
-        var propertyMetadatas = propertiesMetadatas[index] || []; // 查找装饰器列表中有没有@Inject
+        var propertyMetadatas = propertiesMetadatas[index] || []; // 查找装饰器列表中有没有@Inject装饰器的数据
 
-        var ctor = propertyMetadatas.find(function (meta) {
+        var injectMeta = propertyMetadatas.find(function (meta) {
           return meta.key === DECORATOR_KEYS.INJECT;
-        }); // 把装饰器列表收集为对象，并且排除掉@Inject
+        });
+
+        if (injectMeta && injectMeta.value === Object || !injectMeta && paramType === Object) {
+          // 构造函数的参数可以不使用@Inject，但是一定不能是interface
+          throw new InjectFailedError(injectMeta, ClassName, index, paramType);
+        } // 把装饰器列表收集为对象，并且排除掉@Inject
+
 
         var options = propertyMetadatas.reduce(function (acc, meta) {
           if (meta.key !== DECORATOR_KEYS.INJECT) {
@@ -312,67 +622,67 @@ var Injector = /*#__PURE__*/function () {
           return acc;
         }, {});
         return {
-          key: resolveForwardRef(ctor && ctor.value) || paramType,
+          key: resolveForwardRef(injectMeta && injectMeta.value) || paramType,
           value: options
         };
       });
     }
     /**
      * 获取注入的实例属性-返回对象
-     * @done
-     * @param {*} token
+     *
+     * @param {*} ClassName
+     * @param {*} provider
      * @return {*}
      * @memberof Injector
      */
 
   }, {
     key: "getInjectProperties",
-    value: function getInjectProperties(token) {
-      var _this2 = this;
+    value: function getInjectProperties(ClassName, provider) {
+      var _this7 = this;
 
-      var currentParentToken = this.parentToken;
-      this.parentToken = token;
-      var metas = this.getInjectPropertiesMetas(token);
+      var metas = this.getInjectPropertiesMetas(ClassName);
       var properties = {};
       metas.forEach(function (meta) {
         var _meta$value;
 
-        var property = _this2.get(meta.provide, meta.value);
+        var property = _this7.get(meta.provide, _objectSpread(_objectSpread({}, meta.value), {}, {
+          provider: provider
+        }));
 
-        if (!(property === undefined && (_meta$value = meta.value) !== null && _meta$value !== void 0 && _meta$value.optional)) {
-          properties[meta.key] = _this2.get(meta.provide, meta.value);
+        if (!(property === void 0 && (_meta$value = meta.value) !== null && _meta$value !== void 0 && _meta$value.optional)) {
+          properties[meta.key] = property;
         }
       });
-      this.parentToken = currentParentToken;
       return properties;
     }
     /**
      * 获取注入属性的装饰器数据
-     * @done
-     * @param {*} token
+     *
+     * @param {*} ClassName
      * @return {*}
      * @memberof Injector
      */
 
   }, {
     key: "getInjectPropertiesMetas",
-    value: function getInjectPropertiesMetas(token) {
+    value: function getInjectPropertiesMetas(ClassName) {
       // 获取注入属性的metas-类型是Recors<string, Array>
-      var propertiesMetadatas = Reflect.getMetadata(SERVICE_INJECTED_PROPS, token) || {};
+      var propertiesMetadatas = Reflect.getMetadata(DECORATOR_KEYS.SERVICE_INJECTED_PROPS, ClassName) || {};
       var propertiesMetas = [];
 
       for (var key in propertiesMetadatas) {
         if (has(propertiesMetadatas, key)) {
           // 当前key属性对应的所有的装饰器
-          var propertyMetadatas = propertiesMetadatas[key] || []; // 当前key属性对应的@Inject
+          var propertyMetadatas = propertiesMetadatas[key]; // 当前key属性对应的@Inject装饰器的数据
 
-          var ctor = propertyMetadatas.find(function (meta) {
+          var injectMeta = propertyMetadatas.find(function (meta) {
             return meta.key === DECORATOR_KEYS.INJECT;
           });
 
-          if (!ctor) {
+          if (!injectMeta || injectMeta.value === Object) {
             // 属性一定要手动指定@Inject
-            throw new Error(ERROR_INJECT_NOT_VALID);
+            throw new InjectFailedError(injectMeta, ClassName, key);
           }
 
           var options = propertyMetadatas.reduce(function (acc, meta) {
@@ -384,7 +694,7 @@ var Injector = /*#__PURE__*/function () {
           }, {});
           propertiesMetas.push({
             key: key,
-            provide: resolveForwardRef(ctor.value),
+            provide: resolveForwardRef(injectMeta.value),
             value: options
           });
         }
@@ -392,103 +702,25 @@ var Injector = /*#__PURE__*/function () {
 
       return propertiesMetas;
     }
-    /**
-     * 通过provider直接获取service实例
-     * @done
-     * @param {*} provider
-     * @param {*} options
-     * @return {*}
-     * @memberof Injector
-     */
-
-  }, {
-    key: "getServiceByProvider",
-    value: function getServiceByProvider(provider, options) {
-      var _this3 = this;
-
-      if ('useValue' in provider) {
-        return provider.useValue;
-      } else if (provider.useClass) {
-        var serviceValue = this.getServiceByClass(provider.useClass, provider.provide);
-        provider.useValue = this.postHook(serviceValue);
-        return provider.useValue;
-      } else if (provider.useExisting) {
-        var _serviceValue = this.get(provider.useExisting, options);
-
-        provider.useValue = this.postHook(_serviceValue);
-        return provider.useValue;
-      } else if (provider.useFactory) {
-        var deps = provider.deps || [];
-        var args = deps.map(function (dep) {
-          return _this3.get(dep);
-        });
-
-        var _serviceValue2 = provider.useFactory.apply(provider, _toConsumableArray(args));
-
-        provider.useValue = this.postHook(_serviceValue2);
-        return provider.useValue;
-      } else {
-        throw new Error(ERROR_PROVIDER_NOT_VALID);
-      }
-    }
-    /**
-     * 通过类名获取服务实例
-     * @done
-     * @template T
-     * @param {new (...args: any[]) => T} ClassName
-     * @param {*} options
-     * @return {*}
-     * @memberof Injector
-     */
-
-  }, {
-    key: "getServiceByClass",
-    value: function getServiceByClass(ClassName, provide) {
-      var provider = this.providerMap.get(provide);
-
-      if (!provider) {
-        this.addProvider({
-          provide: provide,
-          useClass: ClassName
-        });
-        provider = this.providerMap.get(provide);
-      }
-
-      provider.status = SERVICE_STATUS.INITING;
-      var params = this.getContructorParameters(ClassName);
-      var service = this.postHook(_construct(ClassName, _toConsumableArray(params)));
-      provider.useValue = service;
-      provider.status = SERVICE_STATUS.CONSTRUCTED;
-      var properties = this.getInjectProperties(ClassName);
-      this.mergeHook(service, properties);
-      provider.status = SERVICE_STATUS.MERGED;
-
-      if (service.onInit && typeof service.onInit === 'function') {
-        service.onInit();
-      }
-
-      provider.status = SERVICE_STATUS.INITED;
-      return service;
-    }
     /**
      * 把providers数组转换成map，避免后续的遍历
-     * @done
+     *
      * @param {any[]} providers
      * @memberof Injector
      */
 
   }, {
-    key: "resolveProviders",
-    value: function resolveProviders(providers) {
-      var _this4 = this;
+    key: "addProviders",
+    value: function addProviders(providers) {
+      var _this8 = this;
 
       providers.forEach(function (provider) {
-        _this4.addProvider(provider);
+        _this8.addProvider(provider);
       });
     }
     /**
      * 添加新的provider
-     * @done
+     *
      * @param {*} provider
      * @memberof Injector
      */
@@ -497,10 +729,6 @@ var Injector = /*#__PURE__*/function () {
     key: "addProvider",
     value: function addProvider(provider) {
       if (provider.provide) {
-        if ('useValue' in provider) {
-          provider.useValue = this.postHook(provider.useValue);
-        }
-
         this.providerMap.set(provider.provide, provider);
       } else {
         this.providerMap.set(provider, {
@@ -519,8 +747,12 @@ var Injector = /*#__PURE__*/function () {
     key: "dispose",
     value: function dispose() {
       this.providerMap.forEach(function (value) {
-        if (value && value.dispose) {
-          value.dispose();
+        if (value && value.useCacheValue && value.useCacheValue.dispose) {
+          try {
+            value.useCacheValue.dispose();
+          } catch (error) {
+            console.error(error);
+          }
         }
       });
       this.providerMap = null;
@@ -531,5 +763,5 @@ var Injector = /*#__PURE__*/function () {
   return Injector;
 }();
 
-export { DECORATOR_KEYS, DESIGN_PARAM_TYPES, ERROR_CIRCULAR_DEPENDENCY, ERROR_DISABLE_MULTIPLE_INJECTABLE, ERROR_INJECT_NOT_VALID, ERROR_PROVIDER_NOT_VALID, ERROR_TOKEN_NOT_FOUND, Inject, Injectable, Injector, Optional, SERVICE_INJECTED_PARAMS, SERVICE_INJECTED_PROPS, SERVICE_PARAM_TYPES, SERVICE_STATUS, Self, Skip, forwardRef, has, isForwardRef, merge, resolveForwardRef };
+export { CircularDependencyError, DECORATOR_KEYS, Inject, InjectFailedError, Injectable, Injector, Optional, ProviderNotValidError, SERVICE_STATUS, Self, Skip, TokenNotFoundError, createDecorator, forwardRef, has, isForwardRef, merge, resolveForwardRef };
 //# sourceMappingURL=index.esm.js.map