inversify 4.11.0 → 5.0.1

package/es/constants/error_msgs.js

@@ -22,14 +22,22 @@ export var INVALID_TO_SELF_VALUE = "The toSelf function can only be applied when
     "used as service identifier";
 export var INVALID_DECORATOR_OPERATION = "The @inject @multiInject @tagged and @named decorators " +
     "must be applied to the parameters of a class constructor or a class property.";
-export var ARGUMENTS_LENGTH_MISMATCH_1 = "The number of constructor arguments in the derived class ";
-export var ARGUMENTS_LENGTH_MISMATCH_2 = " must be >= than the number of constructor arguments of its base class.";
+export var ARGUMENTS_LENGTH_MISMATCH = function () {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
+    return "The number of constructor arguments in the derived class " +
+        (values[0] + " must be >= than the number of constructor arguments of its base class.");
+};
 export var CONTAINER_OPTIONS_MUST_BE_AN_OBJECT = "Invalid Container constructor argument. Container options " +
     "must be an object.";
 export var CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE = "Invalid Container option. Default scope must " +
     "be a string ('singleton' or 'transient').";
 export var CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE = "Invalid Container option. Auto bind injectable must " +
     "be a boolean";
+export var CONTAINER_OPTIONS_INVALID_SKIP_BASE_CHECK = "Invalid Container option. Skip base check must " +
+    "be a boolean";
 export var MULTIPLE_POST_CONSTRUCT_METHODS = "Cannot apply @postConstruct decorator multiple times in the same class";
 export var POST_CONSTRUCT_ERROR = function () {
     var values = [];

package/es/container/container.js

@@ -41,40 +41,42 @@ import { MetadataReader } from "../planning/metadata_reader";
 import { createMockRequest, getBindingDictionary, plan } from "../planning/planner";
 import { resolve } from "../resolution/resolver";
 import { BindingToSyntax } from "../syntax/binding_to_syntax";
-import { guid } from "../utils/guid";
+import { id } from "../utils/id";
 import { getServiceIdentifierAsString } from "../utils/serialization";
 import { ContainerSnapshot } from "./container_snapshot";
 import { Lookup } from "./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 !== BindingScopeEnum.Singleton &&
-                    containerOptions.defaultScope !== BindingScopeEnum.Transient &&
-                    containerOptions.defaultScope !== 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: BindingScopeEnum.Transient
-            };
+        if (options.defaultScope === undefined) {
+            options.defaultScope = BindingScopeEnum.Transient;
         }
-        this.guid = guid();
+        else if (options.defaultScope !== BindingScopeEnum.Singleton &&
+            options.defaultScope !== BindingScopeEnum.Transient &&
+            options.defaultScope !== 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.id = id();
         this._bindingDictionary = new Lookup();
         this._snapshots = [];
         this._middleware = null;
@@ -105,7 +107,7 @@ var Container = (function () {
         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);
+            var containerModuleHelpers = getHelpers(currentModule.id);
             currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction);
         }
     };
@@ -125,7 +127,7 @@ var Container = (function () {
                     case 1:
                         if (!(_a < modules_2.length)) return [3, 4];
                         currentModule = modules_2[_a];
-                        containerModuleHelpers = getHelpers(currentModule.guid);
+                        containerModuleHelpers = getHelpers(currentModule.id);
                         return [4, currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction)];
                     case 2:
                         _b.sent();
@@ -148,7 +150,7 @@ var Container = (function () {
             return item.moduleId === expected;
         }; };
         modules.forEach(function (module) {
-            var condition = conditionFactory(module.guid);
+            var condition = conditionFactory(module.id);
             _this._bindingDictionary.removeByCondition(condition);
         });
     };
@@ -206,8 +208,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 || this.options);
         child.parent = this;
         return child;
     };
@@ -241,9 +243,8 @@ var Container = (function () {
         return this.getAllTagged(serviceIdentifier, METADATA_KEY.NAMED_TAG, named);
     };
     Container.prototype.resolve = function (constructorFunction) {
-        var tempContainer = new Container();
+        var tempContainer = this.createChild();
         tempContainer.bind(constructorFunction).toSelf();
-        tempContainer.parent = this;
         return tempContainer.get(constructorFunction);
     };
     Container.prototype._getContainerModuleHelpersFactory = function () {

package/es/container/container_module.js

@@ -1,7 +1,7 @@
-import { guid } from "../utils/guid";
+import { id } from "../utils/id";
 var ContainerModule = (function () {
     function ContainerModule(registry) {
-        this.guid = guid();
+        this.id = id();
         this.registry = registry;
     }
     return ContainerModule;
@@ -9,7 +9,7 @@ var ContainerModule = (function () {
 export { ContainerModule };
 var AsyncContainerModule = (function () {
     function AsyncContainerModule(registry) {
-        this.guid = guid();
+        this.id = id();
         this.registry = registry;
     }
     return AsyncContainerModule;

package/es/inversify.js

@@ -2,7 +2,7 @@ import * as keys from "./constants/metadata_keys";
 export var METADATA_KEY = keys;
 export { Container } from "./container/container";
 export { BindingScopeEnum, BindingTypeEnum, TargetTypeEnum } from "./constants/literal_types";
-export { ContainerModule } from "./container/container_module";
+export { AsyncContainerModule, ContainerModule } from "./container/container_module";
 export { injectable } from "./annotation/injectable";
 export { tagged } from "./annotation/tagged";
 export { named } from "./annotation/named";
@@ -13,7 +13,7 @@ export { multiInject } from "./annotation/multi_inject";
 export { targetName } from "./annotation/target_name";
 export { postConstruct } from "./annotation/post_construct";
 export { MetadataReader } from "./planning/metadata_reader";
-export { guid } from "./utils/guid";
+export { id } from "./utils/id";
 export { decorate } from "./annotation/decorator_utils";
 export { traverseAncerstors, taggedConstraint, namedConstraint, typeConstraint } from "./syntax/constraint_helpers";
 export { getServiceIdentifierAsString } from "./utils/serialization";

package/es/planning/context.js

@@ -1,7 +1,7 @@
-import { guid } from "../utils/guid";
+import { id } from "../utils/id";
 var Context = (function () {
     function Context(container) {
-        this.guid = guid();
+        this.id = id();
         this.container = container;
     }
     Context.prototype.addPlan = function (plan) {

package/es/planning/planner.js

@@ -7,7 +7,7 @@ import { circularDependencyToException, getServiceIdentifierAsString, listMetada
 import { Context } from "./context";
 import { Metadata } from "./metadata";
 import { Plan } from "./plan";
-import { getDependencies } from "./reflection_utils";
+import { getBaseClassDependencyCount, getDependencies, getFunctionName } from "./reflection_utils";
 import { Request } from "./request";
 import { Target } from "./target";
 function getBindingDictionary(cntnr) {
@@ -101,6 +101,13 @@ function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier,
         }
         if (binding.type === BindingTypeEnum.Instance && binding.implementationType !== null) {
             var dependencies = getDependencies(metadataReader, binding.implementationType);
+            if (!context.container.options.skipBaseClassChecks) {
+                var baseClassDependencyCount = getBaseClassDependencyCount(metadataReader, binding.implementationType);
+                if (dependencies.length < baseClassDependencyCount) {
+                    var error = ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH(getFunctionName(binding.implementationType));
+                    throw new Error(error);
+                }
+            }
             dependencies.forEach(function (dependency) {
                 _createSubRequests(metadataReader, false, dependency.serviceIdentifier, context, subChildRequest, dependency);
             });

package/es/planning/reflection_utils.js

@@ -23,12 +23,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) {
@@ -123,4 +117,4 @@ function formatTargetMetadata(targetMetadata) {
         unmanaged: targetMetadataMap[METADATA_KEY.UNMANAGED_TAG]
     };
 }
-export { getDependencies };
+export { getDependencies, getBaseClassDependencyCount, getFunctionName };

package/es/planning/request.js

@@ -1,7 +1,7 @@
-import { guid } from "../utils/guid";
+import { id } from "../utils/id";
 var Request = (function () {
     function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
-        this.guid = guid();
+        this.id = id();
         this.serviceIdentifier = serviceIdentifier;
         this.parentContext = parentContext;
         this.parentRequest = parentRequest;

package/es/planning/target.js

@@ -1,10 +1,10 @@
 import * as METADATA_KEY from "../constants/metadata_keys";
-import { guid } from "../utils/guid";
+import { id } from "../utils/id";
 import { Metadata } from "./metadata";
 import { QueryableString } from "./queryable_string";
 var Target = (function () {
     function Target(type, name, serviceIdentifier, namedOrTagged) {
-        this.guid = guid();
+        this.id = id();
         this.type = type;
         this.serviceIdentifier = serviceIdentifier;
         this.name = new QueryableString(name || "");

package/es/resolution/resolver.js

@@ -45,8 +45,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                requestScope.has(binding_1.guid)) {
-                return requestScope.get(binding_1.guid);
+                requestScope.has(binding_1.id)) {
+                return requestScope.get(binding_1.id);
             }
             if (binding_1.type === BindingTypeEnum.ConstantValue) {
                 result = binding_1.cache;
@@ -82,8 +82,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                !requestScope.has(binding_1.guid)) {
-                requestScope.set(binding_1.guid, result);
+                !requestScope.has(binding_1.id)) {
+                requestScope.set(binding_1.id, result);
             }
             return result;
         }

package/es/utils/id.js

@@ -0,0 +1,5 @@
+var idCounter = 0;
+function id() {
+    return idCounter++;
+}
+export { id };

package/lib/annotation/decorator_utils.js

@@ -30,7 +30,7 @@ function _tagParameterOrProperty(metadataKey, annotationTarget, propertyName, me
         for (var _i = 0, paramOrPropertyMetadata_1 = paramOrPropertyMetadata; _i < paramOrPropertyMetadata_1.length; _i++) {
             var m = paramOrPropertyMetadata_1[_i];
             if (m.key === metadata.key) {
-                throw new Error(ERROR_MSGS.DUPLICATED_METADATA + " " + m.key);
+                throw new Error(ERROR_MSGS.DUPLICATED_METADATA + " " + m.key.toString());
             }
         }
     }

package/lib/bindings/binding.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var literal_types_1 = require("../constants/literal_types");
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var Binding = (function () {
     function Binding(serviceIdentifier, scope) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.activated = false;
         this.serviceIdentifier = serviceIdentifier;
         this.scope = scope;

package/lib/constants/error_msgs.js

@@ -24,14 +24,22 @@ exports.INVALID_TO_SELF_VALUE = "The toSelf function can only be applied when a
     "used as service identifier";
 exports.INVALID_DECORATOR_OPERATION = "The @inject @multiInject @tagged and @named decorators " +
     "must be applied to the parameters of a class constructor or a class property.";
-exports.ARGUMENTS_LENGTH_MISMATCH_1 = "The number of constructor arguments in the derived class ";
-exports.ARGUMENTS_LENGTH_MISMATCH_2 = " must be >= than the number of constructor arguments of its base class.";
+exports.ARGUMENTS_LENGTH_MISMATCH = function () {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
+    return "The number of constructor arguments in the derived class " +
+        (values[0] + " must be >= than the number of constructor arguments of its base class.");
+};
 exports.CONTAINER_OPTIONS_MUST_BE_AN_OBJECT = "Invalid Container constructor argument. Container options " +
     "must be an object.";
 exports.CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE = "Invalid Container option. Default scope must " +
     "be a string ('singleton' or 'transient').";
 exports.CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE = "Invalid Container option. Auto bind injectable must " +
     "be a boolean";
+exports.CONTAINER_OPTIONS_INVALID_SKIP_BASE_CHECK = "Invalid Container option. Skip base check must " +
+    "be a boolean";
 exports.MULTIPLE_POST_CONSTRUCT_METHODS = "Cannot apply @postConstruct decorator multiple times in the same class";
 exports.POST_CONSTRUCT_ERROR = function () {
     var values = [];

package/lib/container/container.js

@@ -43,40 +43,42 @@ var metadata_reader_1 = require("../planning/metadata_reader");
 var planner_1 = require("../planning/planner");
 var resolver_1 = require("../resolution/resolver");
 var binding_to_syntax_1 = require("../syntax/binding_to_syntax");
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var serialization_1 = require("../utils/serialization");
 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;
         }
-        this.guid = guid_1.guid();
+        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.id = id_1.id();
         this._bindingDictionary = new lookup_1.Lookup();
         this._snapshots = [];
         this._middleware = null;
@@ -107,7 +109,7 @@ var Container = (function () {
         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);
+            var containerModuleHelpers = getHelpers(currentModule.id);
             currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction);
         }
     };
@@ -127,7 +129,7 @@ var Container = (function () {
                     case 1:
                         if (!(_a < modules_2.length)) return [3, 4];
                         currentModule = modules_2[_a];
-                        containerModuleHelpers = getHelpers(currentModule.guid);
+                        containerModuleHelpers = getHelpers(currentModule.id);
                         return [4, currentModule.registry(containerModuleHelpers.bindFunction, containerModuleHelpers.unbindFunction, containerModuleHelpers.isboundFunction, containerModuleHelpers.rebindFunction)];
                     case 2:
                         _b.sent();
@@ -150,7 +152,7 @@ var Container = (function () {
             return item.moduleId === expected;
         }; };
         modules.forEach(function (module) {
-            var condition = conditionFactory(module.guid);
+            var condition = conditionFactory(module.id);
             _this._bindingDictionary.removeByCondition(condition);
         });
     };
@@ -208,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 || this.options);
         child.parent = this;
         return child;
     };
@@ -243,9 +245,8 @@ var Container = (function () {
         return this.getAllTagged(serviceIdentifier, METADATA_KEY.NAMED_TAG, named);
     };
     Container.prototype.resolve = function (constructorFunction) {
-        var tempContainer = new Container();
+        var tempContainer = this.createChild();
         tempContainer.bind(constructorFunction).toSelf();
-        tempContainer.parent = this;
         return tempContainer.get(constructorFunction);
     };
     Container.prototype._getContainerModuleHelpersFactory = function () {

package/lib/container/container_module.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var ContainerModule = (function () {
     function ContainerModule(registry) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.registry = registry;
     }
     return ContainerModule;
@@ -11,7 +11,7 @@ var ContainerModule = (function () {
 exports.ContainerModule = ContainerModule;
 var AsyncContainerModule = (function () {
     function AsyncContainerModule(registry) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.registry = registry;
     }
     return 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;
@@ -31,8 +32,8 @@ var post_construct_1 = require("./annotation/post_construct");
 exports.postConstruct = post_construct_1.postConstruct;
 var metadata_reader_1 = require("./planning/metadata_reader");
 exports.MetadataReader = metadata_reader_1.MetadataReader;
-var guid_1 = require("./utils/guid");
-exports.guid = guid_1.guid;
+var id_1 = require("./utils/id");
+exports.id = id_1.id;
 var decorator_utils_1 = require("./annotation/decorator_utils");
 exports.decorate = decorator_utils_1.decorate;
 var constraint_helpers_1 = require("./syntax/constraint_helpers");

package/lib/planning/context.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var Context = (function () {
     function Context(container) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.container = container;
     }
     Context.prototype.addPlan = function (plan) {

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

@@ -5,6 +5,7 @@ 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);
@@ -26,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) {
@@ -114,6 +109,7 @@ function getBaseClassDependencyCount(metadataReader, func) {
         return 0;
     }
 }
+exports.getBaseClassDependencyCount = getBaseClassDependencyCount;
 function formatTargetMetadata(targetMetadata) {
     var targetMetadataMap = {};
     targetMetadata.forEach(function (m) {

package/lib/planning/request.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var Request = (function () {
     function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.serviceIdentifier = serviceIdentifier;
         this.parentContext = parentContext;
         this.parentRequest = parentRequest;

package/lib/planning/target.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var METADATA_KEY = require("../constants/metadata_keys");
-var guid_1 = require("../utils/guid");
+var id_1 = require("../utils/id");
 var metadata_1 = require("./metadata");
 var queryable_string_1 = require("./queryable_string");
 var Target = (function () {
     function Target(type, name, serviceIdentifier, namedOrTagged) {
-        this.guid = guid_1.guid();
+        this.id = id_1.id();
         this.type = type;
         this.serviceIdentifier = serviceIdentifier;
         this.name = new queryable_string_1.QueryableString(name || "");

package/lib/resolution/resolver.js

@@ -47,8 +47,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                requestScope.has(binding_1.guid)) {
-                return requestScope.get(binding_1.guid);
+                requestScope.has(binding_1.id)) {
+                return requestScope.get(binding_1.id);
             }
             if (binding_1.type === literal_types_1.BindingTypeEnum.ConstantValue) {
                 result = binding_1.cache;
@@ -84,8 +84,8 @@ var _resolveRequest = function (requestScope) {
             }
             if (isRequestSingleton &&
                 requestScope !== null &&
-                !requestScope.has(binding_1.guid)) {
-                requestScope.set(binding_1.guid, result);
+                !requestScope.has(binding_1.id)) {
+                requestScope.set(binding_1.id, result);
             }
             return result;
         }

package/lib/utils/id.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var idCounter = 0;
+function id() {
+    return idCounter++;
+}
+exports.id = id;