inversify 4.9.0 → 4.13.0

package/lib/container/container.js

@@ -1,4 +1,39 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [0, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var binding_1 = require("../bindings/binding");
 var ERROR_MSGS = require("../constants/error_msgs");
@@ -14,33 +49,35 @@ var container_snapshot_1 = require("./container_snapshot");
 var lookup_1 = require("./lookup");
 var Container = (function () {
     function Container(containerOptions) {
-        if (containerOptions !== undefined) {
-            if (typeof containerOptions !== "object") {
-                throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_MUST_BE_AN_OBJECT);
-            }
-            else {
-                if (containerOptions.defaultScope !== undefined &&
-                    containerOptions.defaultScope !== literal_types_1.BindingScopeEnum.Singleton &&
-                    containerOptions.defaultScope !== literal_types_1.BindingScopeEnum.Transient &&
-                    containerOptions.defaultScope !== literal_types_1.BindingScopeEnum.Request) {
-                    throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE);
-                }
-                if (containerOptions.autoBindInjectable !== undefined &&
-                    typeof containerOptions.autoBindInjectable !== "boolean") {
-                    throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE);
-                }
-            }
-            this.options = {
-                autoBindInjectable: containerOptions.autoBindInjectable,
-                defaultScope: containerOptions.defaultScope
-            };
+        var options = containerOptions || {};
+        if (typeof options !== "object") {
+            throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_MUST_BE_AN_OBJECT);
         }
-        else {
-            this.options = {
-                autoBindInjectable: false,
-                defaultScope: literal_types_1.BindingScopeEnum.Transient
-            };
+        if (options.defaultScope === undefined) {
+            options.defaultScope = literal_types_1.BindingScopeEnum.Transient;
+        }
+        else if (options.defaultScope !== literal_types_1.BindingScopeEnum.Singleton &&
+            options.defaultScope !== literal_types_1.BindingScopeEnum.Transient &&
+            options.defaultScope !== literal_types_1.BindingScopeEnum.Request) {
+            throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE);
+        }
+        if (options.autoBindInjectable === undefined) {
+            options.autoBindInjectable = false;
         }
+        else if (typeof options.autoBindInjectable !== "boolean") {
+            throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE);
+        }
+        if (options.skipBaseClassChecks === undefined) {
+            options.skipBaseClassChecks = false;
+        }
+        else if (typeof options.skipBaseClassChecks !== "boolean") {
+            throw new Error("" + ERROR_MSGS.CONTAINER_OPTIONS_INVALID_SKIP_BASE_CHECK);
+        }
+        this.options = {
+            autoBindInjectable: options.autoBindInjectable,
+            defaultScope: options.defaultScope,
+            skipBaseClassChecks: options.skipBaseClassChecks
+        };
         this.guid = guid_1.guid();
         this._bindingDictionary = new lookup_1.Lookup();
         this._snapshots = [];
@@ -65,46 +102,44 @@ var Container = (function () {
         return container;
     };
     Container.prototype.load = function () {
-        var _this = this;
         var modules = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             modules[_i] = arguments[_i];
         }
-        var setModuleId = function (bindingToSyntax, moduleId) {
-            bindingToSyntax._binding.moduleId = moduleId;
-        };
-        var getBindFunction = function (moduleId) {
-            return function (serviceIdentifier) {
-                var bindingToSyntax = _this.bind.call(_this, serviceIdentifier);
-                setModuleId(bindingToSyntax, moduleId);
-                return bindingToSyntax;
-            };
-        };
-        var getUnbindFunction = function (moduleId) {
-            return function (serviceIdentifier) {
-                var _unbind = _this.unbind.bind(_this);
-                _unbind(serviceIdentifier);
-            };
-        };
-        var getIsboundFunction = function (moduleId) {
-            return function (serviceIdentifier) {
-                var _isBound = _this.isBound.bind(_this);
-                return _isBound(serviceIdentifier);
-            };
-        };
-        var getRebindFunction = function (moduleId) {
-            return function (serviceIdentifier) {
-                var bindingToSyntax = _this.rebind.call(_this, serviceIdentifier);
-                setModuleId(bindingToSyntax, moduleId);
-                return bindingToSyntax;
-            };
-        };
-        modules.forEach(function (module) {
-            var bindFunction = getBindFunction(module.guid);
-            var unbindFunction = getUnbindFunction(module.guid);
-            var isboundFunction = getIsboundFunction(module.guid);
-            var rebindFunction = getRebindFunction(module.guid);
-            module.registry(bindFunction, unbindFunction, isboundFunction, rebindFunction);
+        var getHelpers = this._getContainerModuleHelpersFactory();
+        for (var _a = 0, modules_1 = modules; _a < modules_1.length; _a++) {
+            var currentModule = modules_1[_a];
+            var containerModuleHelpers = getHelpers(currentModule.guid);
+            currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction);
+        }
+    };
+    Container.prototype.loadAsync = function () {
+        var modules = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            modules[_i] = arguments[_i];
+        }
+        return __awaiter(this, void 0, void 0, function () {
+            var getHelpers, _a, modules_2, currentModule, containerModuleHelpers;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        getHelpers = this._getContainerModuleHelpersFactory();
+                        _a = 0, modules_2 = modules;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_a < modules_2.length)) return [3, 4];
+                        currentModule = modules_2[_a];
+                        containerModuleHelpers = getHelpers(currentModule.guid);
+                        return [4, currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        _a++;
+                        return [3, 1];
+                    case 4: return [2];
+                }
+            });
         });
     };
     Container.prototype.unload = function () {
@@ -175,8 +210,8 @@ var Container = (function () {
         this._bindingDictionary = snapshot.bindings;
         this._middleware = snapshot.middleware;
     };
-    Container.prototype.createChild = function () {
-        var child = new Container();
+    Container.prototype.createChild = function (containerOptions) {
+        var child = new Container(containerOptions);
         child.parent = this;
         return child;
     };
@@ -215,6 +250,46 @@ var Container = (function () {
         tempContainer.parent = this;
         return tempContainer.get(constructorFunction);
     };
+    Container.prototype._getContainerModuleHelpersFactory = function () {
+        var _this = this;
+        var setModuleId = function (bindingToSyntax, moduleId) {
+            bindingToSyntax._binding.moduleId = moduleId;
+        };
+        var getBindFunction = function (moduleId) {
+            return function (serviceIdentifier) {
+                var _bind = _this.bind.bind(_this);
+                var bindingToSyntax = _bind(serviceIdentifier);
+                setModuleId(bindingToSyntax, moduleId);
+                return bindingToSyntax;
+            };
+        };
+        var getUnbindFunction = function (moduleId) {
+            return function (serviceIdentifier) {
+                var _unbind = _this.unbind.bind(_this);
+                _unbind(serviceIdentifier);
+            };
+        };
+        var getIsboundFunction = function (moduleId) {
+            return function (serviceIdentifier) {
+                var _isBound = _this.isBound.bind(_this);
+                return _isBound(serviceIdentifier);
+            };
+        };
+        var getRebindFunction = function (moduleId) {
+            return function (serviceIdentifier) {
+                var _rebind = _this.rebind.bind(_this);
+                var bindingToSyntax = _rebind(serviceIdentifier);
+                setModuleId(bindingToSyntax, moduleId);
+                return bindingToSyntax;
+            };
+        };
+        return function (mId) { return ({
+            bindFunction: getBindFunction(mId),
+            isboundFunction: getIsboundFunction(mId),
+            rebindFunction: getRebindFunction(mId),
+            unbindFunction: getUnbindFunction(mId)
+        }); };
+    };
     Container.prototype._get = function (avoidConstraints, isMultiInject, targetType, serviceIdentifier, key, value) {
         var result = null;
         var defaultArgs = {

package/lib/container/container_module.js

@@ -9,3 +9,11 @@ var ContainerModule = (function () {
     return ContainerModule;
 }());
 exports.ContainerModule = ContainerModule;
+var AsyncContainerModule = (function () {
+    function AsyncContainerModule(registry) {
+        this.guid = guid_1.guid();
+        this.registry = registry;
+    }
+    return AsyncContainerModule;
+}());
+exports.AsyncContainerModule = AsyncContainerModule;

package/lib/inversify.js

@@ -9,6 +9,7 @@ exports.BindingScopeEnum = literal_types_1.BindingScopeEnum;
 exports.BindingTypeEnum = literal_types_1.BindingTypeEnum;
 exports.TargetTypeEnum = literal_types_1.TargetTypeEnum;
 var container_module_1 = require("./container/container_module");
+exports.AsyncContainerModule = container_module_1.AsyncContainerModule;
 exports.ContainerModule = container_module_1.ContainerModule;
 var injectable_1 = require("./annotation/injectable");
 exports.injectable = injectable_1.injectable;
@@ -18,6 +19,7 @@ var named_1 = require("./annotation/named");
 exports.named = named_1.named;
 var inject_1 = require("./annotation/inject");
 exports.inject = inject_1.inject;
+exports.LazyServiceIdentifer = inject_1.LazyServiceIdentifer;
 var optional_1 = require("./annotation/optional");
 exports.optional = optional_1.optional;
 var unmanaged_1 = require("./annotation/unmanaged");

package/lib/planning/planner.js

@@ -104,6 +104,13 @@ function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier,
         }
         if (binding.type === literal_types_1.BindingTypeEnum.Instance && binding.implementationType !== null) {
             var dependencies = reflection_utils_1.getDependencies(metadataReader, binding.implementationType);
+            if (!context.container.options.skipBaseClassChecks) {
+                var baseClassDependencyCount = reflection_utils_1.getBaseClassDependencyCount(metadataReader, binding.implementationType);
+                if (dependencies.length < baseClassDependencyCount) {
+                    var error = ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH(reflection_utils_1.getFunctionName(binding.implementationType));
+                    throw new Error(error);
+                }
+            }
             dependencies.forEach(function (dependency) {
                 _createSubRequests(metadataReader, false, dependency.serviceIdentifier, context, subChildRequest, dependency);
             });

package/lib/planning/reflection_utils.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var inject_1 = require("../annotation/inject");
 var ERROR_MSGS = require("../constants/error_msgs");
 var literal_types_1 = require("../constants/literal_types");
 var METADATA_KEY = require("../constants/metadata_keys");
 var serialization_1 = require("../utils/serialization");
+exports.getFunctionName = serialization_1.getFunctionName;
 var target_1 = require("./target");
 function getDependencies(metadataReader, func) {
     var constructorName = serialization_1.getFunctionName(func);
@@ -25,12 +27,6 @@ function getTargets(metadataReader, constructorName, func, isBaseClass) {
     var constructorTargets = getConstructorArgsAsTargets(isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata, iterations);
     var propertyTargets = getClassPropsAsTargets(metadataReader, func);
     var targets = constructorTargets.concat(propertyTargets);
-    var baseClassDependencyCount = getBaseClassDependencyCount(metadataReader, func);
-    if (targets.length < baseClassDependencyCount) {
-        var error = ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH_1 +
-            constructorName + ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH_2;
-        throw new Error(error);
-    }
     return targets;
 }
 function getConstructorArgsAsTarget(index, isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata) {
@@ -40,6 +36,9 @@ function getConstructorArgsAsTarget(index, isBaseClass, constructorName, service
     var serviceIdentifier = serviceIdentifiers[index];
     var injectIdentifier = (metadata.inject || metadata.multiInject);
     serviceIdentifier = (injectIdentifier) ? (injectIdentifier) : serviceIdentifier;
+    if (serviceIdentifier instanceof inject_1.LazyServiceIdentifer) {
+        serviceIdentifier = serviceIdentifier.unwrap();
+    }
     if (isManaged) {
         var isObject = serviceIdentifier === Object;
         var isFunction = serviceIdentifier === Function;
@@ -110,6 +109,7 @@ function getBaseClassDependencyCount(metadataReader, func) {
         return 0;
     }
 }
+exports.getBaseClassDependencyCount = getBaseClassDependencyCount;
 function formatTargetMetadata(targetMetadata) {
     var targetMetadataMap = {};
     targetMetadata.forEach(function (m) {

package/package.json

@@ -1,80 +1,80 @@
-{
-  "name": "inversify",
-  "version": "4.9.0",
-  "description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.",
-  "main": "lib/inversify.js",
-  "jsnext:main": "es/inversify.js",
-  "types": "./dts/inversify.d.ts",
-  "directories": {
-    "test": "gulp"
-  },
-  "scripts": {
-    "test": "gulp",
-    "publish-please": "publish-please",
-    "prepublish": "publish-please guard"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/inversify/InversifyJS.git"
-  },
-  "keywords": [
-    "ioc",
-    "di",
-    "javascript",
-    "typescript",
-    "node",
-    "dependency injection",
-    "dependency inversion",
-    "inversion of control container"
-  ],
-  "author": "Remo H. Jansen",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/inversify/InversifyJS/issues"
-  },
-  "homepage": "http://inversify.io",
-  "engines": {},
-  "devDependencies": {
-    "@types/chai": "4.0.10",
-    "@types/harmony-proxy": "1.0.29",
-    "@types/mocha": " 2.2.44",
-    "@types/sinon": "4.1.2",
-    "bluebird": "3.5.1",
-    "browserify": "14.5.0",
-    "chai": "4.1.2",
-    "del": "3.0.0",
-    "es6-symbol": "3.1.1",
-    "gulp": "3.9.1",
-    "gulp-istanbul": "1.1.2",
-    "gulp-mocha": "3.0.1",
-    "gulp-rename": "1.2.2",
-    "gulp-sourcemaps": "2.6.1",
-    "gulp-tslint": "8.1.2",
-    "gulp-typescript": "3.2.3",
-    "gulp-uglify": "3.0.0",
-    "harmonize": "2.0.0",
-    "harmony-proxy": "1.0.1",
-    "istanbul": "0.4.5",
-    "karma": "1.7.1",
-    "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-commonjs": "1.0.0",
-    "karma-es6-shim": "1.0.0",
-    "karma-firefox-launcher": "1.1.0",
-    "karma-ie-launcher": "1.0.0",
-    "karma-mocha": "1.3.0",
-    "karma-mocha-reporter": "2.2.5",
-    "karma-phantomjs-launcher": "1.0.4",
-    "karma-sinon": "1.0.5",
-    "mocha": "4.0.1",
-    "performance-now": "2.1.0",
-    "publish-please": "2.3.1",
-    "reflect-metadata": "0.1.10",
-    "run-sequence": "2.2.0",
-    "sinon": "4.1.3",
-    "tslint": "5.8.0",
-    "typescript": "2.6.2",
-    "vinyl-buffer": "1.0.0",
-    "vinyl-source-stream": "1.1.0"
-  }
-}
+{
+  "name": "inversify",
+  "version": "4.13.0",
+  "description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.",
+  "main": "lib/inversify.js",
+  "jsnext:main": "es/inversify.js",
+  "types": "./dts/inversify.d.ts",
+  "directories": {
+    "test": "gulp"
+  },
+  "scripts": {
+    "test": "gulp",
+    "publish-please": "publish-please",
+    "prepublish": "publish-please guard"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/inversify/InversifyJS.git"
+  },
+  "keywords": [
+    "ioc",
+    "di",
+    "javascript",
+    "typescript",
+    "node",
+    "dependency injection",
+    "dependency inversion",
+    "inversion of control container"
+  ],
+  "author": "Remo H. Jansen",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/inversify/InversifyJS/issues"
+  },
+  "homepage": "http://inversify.io",
+  "engines": {},
+  "devDependencies": {
+    "@types/chai": "4.1.2",
+    "@types/harmony-proxy": "1.0.29",
+    "@types/mocha": "5.0.0",
+    "@types/sinon": "4.3.1",
+    "bluebird": "3.5.1",
+    "browserify": "16.2.0",
+    "chai": "4.1.2",
+    "del": "3.0.0",
+    "es6-symbol": "3.1.1",
+    "gulp": "3.9.1",
+    "gulp-istanbul": "1.1.3",
+    "gulp-mocha": "5.0.0",
+    "gulp-rename": "1.2.2",
+    "gulp-sourcemaps": "2.6.3",
+    "gulp-tslint": "8.1.3",
+    "gulp-typescript": "4.0.2",
+    "gulp-uglify": "3.0.0",
+    "harmonize": "2.0.0",
+    "harmony-proxy": "1.0.1",
+    "istanbul": "0.4.5",
+    "karma": "2.0.0",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "2.2.0",
+    "karma-commonjs": "1.0.0",
+    "karma-es6-shim": "1.0.0",
+    "karma-firefox-launcher": "1.1.0",
+    "karma-ie-launcher": "1.0.0",
+    "karma-mocha": "1.3.0",
+    "karma-mocha-reporter": "2.2.5",
+    "karma-phantomjs-launcher": "1.0.4",
+    "karma-sinon": "1.0.5",
+    "mocha": "5.1.0",
+    "performance-now": "2.1.0",
+    "publish-please": "2.4.1",
+    "reflect-metadata": "0.1.12",
+    "run-sequence": "2.2.1",
+    "sinon": "5.0.0",
+    "tslint": "5.9.1",
+    "typescript": "2.6.2",
+    "vinyl-source-stream": "2.0.0",
+    "vinyl-buffer": "1.0.1"
+  }
+}