inversify 6.0.2 → 6.1.0

package/es/planning/planner.js

@@ -1,147 +1,165 @@
-import { BindingCount } from '../bindings/binding_count';
-import * as ERROR_MSGS from '../constants/error_msgs';
-import { BindingTypeEnum, TargetTypeEnum } from '../constants/literal_types';
-import * as METADATA_KEY from '../constants/metadata_keys';
-import { isStackOverflowExeption } from '../utils/exceptions';
-import { circularDependencyToException, getServiceIdentifierAsString, listMetadataForTarget, listRegisteredBindingsForServiceIdentifier } from '../utils/serialization';
-import { Context } from './context';
-import { Metadata } from './metadata';
-import { Plan } from './plan';
-import { getBaseClassDependencyCount, getDependencies, getFunctionName } from './reflection_utils';
-import { Request } from './request';
-import { Target } from './target';
-function getBindingDictionary(cntnr) {
-    return cntnr._bindingDictionary;
-}
-function _createTarget(isMultiInject, targetType, serviceIdentifier, name, key, value) {
-    var metadataKey = isMultiInject ? METADATA_KEY.MULTI_INJECT_TAG : METADATA_KEY.INJECT_TAG;
-    var injectMetadata = new Metadata(metadataKey, serviceIdentifier);
-    var target = new Target(targetType, name, serviceIdentifier, injectMetadata);
-    if (key !== undefined) {
-        var tagMetadata = new Metadata(key, value);
-        target.metadata.push(tagMetadata);
-    }
-    return target;
-}
-function _getActiveBindings(metadataReader, avoidConstraints, context, parentRequest, target) {
-    var bindings = getBindings(context.container, target.serviceIdentifier);
-    var activeBindings = [];
-    if (bindings.length === BindingCount.NoBindingsAvailable &&
-        context.container.options.autoBindInjectable &&
-        typeof target.serviceIdentifier === 'function' &&
-        metadataReader.getConstructorMetadata(target.serviceIdentifier).compilerGeneratedMetadata) {
-        context.container.bind(target.serviceIdentifier).toSelf();
-        bindings = getBindings(context.container, target.serviceIdentifier);
-    }
-    if (!avoidConstraints) {
-        activeBindings = bindings.filter(function (binding) {
-            var request = new Request(binding.serviceIdentifier, context, parentRequest, binding, target);
-            return binding.constraint(request);
-        });
-    }
-    else {
-        activeBindings = bindings;
-    }
-    _validateActiveBindingCount(target.serviceIdentifier, activeBindings, target, context.container);
-    return activeBindings;
-}
-function _validateActiveBindingCount(serviceIdentifier, bindings, target, container) {
-    switch (bindings.length) {
-        case BindingCount.NoBindingsAvailable:
-            if (target.isOptional()) {
-                return bindings;
-            }
-            else {
-                var serviceIdentifierString = getServiceIdentifierAsString(serviceIdentifier);
-                var msg = ERROR_MSGS.NOT_REGISTERED;
-                msg += listMetadataForTarget(serviceIdentifierString, target);
-                msg += listRegisteredBindingsForServiceIdentifier(container, serviceIdentifierString, getBindings);
-                throw new Error(msg);
-            }
-        case BindingCount.OnlyOneBindingAvailable:
-            return bindings;
-        case BindingCount.MultipleBindingsAvailable:
-        default:
-            if (!target.isArray()) {
-                var serviceIdentifierString = getServiceIdentifierAsString(serviceIdentifier);
-                var msg = ERROR_MSGS.AMBIGUOUS_MATCH + " " + serviceIdentifierString;
-                msg += listRegisteredBindingsForServiceIdentifier(container, serviceIdentifierString, getBindings);
-                throw new Error(msg);
-            }
-            else {
-                return bindings;
-            }
-    }
-}
-function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, parentRequest, target) {
-    var activeBindings;
-    var childRequest;
-    if (parentRequest === null) {
-        activeBindings = _getActiveBindings(metadataReader, avoidConstraints, context, null, target);
-        childRequest = new Request(serviceIdentifier, context, null, activeBindings, target);
-        var thePlan = new Plan(context, childRequest);
-        context.addPlan(thePlan);
-    }
-    else {
-        activeBindings = _getActiveBindings(metadataReader, avoidConstraints, context, parentRequest, target);
-        childRequest = parentRequest.addChildRequest(target.serviceIdentifier, activeBindings, target);
-    }
-    activeBindings.forEach(function (binding) {
-        var subChildRequest = null;
-        if (target.isArray()) {
-            subChildRequest = childRequest.addChildRequest(binding.serviceIdentifier, binding, target);
-        }
-        else {
-            if (binding.cache) {
-                return;
-            }
-            subChildRequest = childRequest;
-        }
-        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);
-            });
-        }
-    });
-}
-function getBindings(container, serviceIdentifier) {
-    var bindings = [];
-    var bindingDictionary = getBindingDictionary(container);
-    if (bindingDictionary.hasKey(serviceIdentifier)) {
-        bindings = bindingDictionary.get(serviceIdentifier);
-    }
-    else if (container.parent !== null) {
-        bindings = getBindings(container.parent, serviceIdentifier);
-    }
-    return bindings;
-}
-function plan(metadataReader, container, isMultiInject, targetType, serviceIdentifier, key, value, avoidConstraints) {
-    if (avoidConstraints === void 0) { avoidConstraints = false; }
-    var context = new Context(container);
-    var target = _createTarget(isMultiInject, targetType, serviceIdentifier, '', key, value);
-    try {
-        _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, null, target);
-        return context;
-    }
-    catch (error) {
-        if (isStackOverflowExeption(error)) {
-            circularDependencyToException(context.plan.rootRequest);
-        }
-        throw error;
-    }
-}
-function createMockRequest(container, serviceIdentifier, key, value) {
-    var target = new Target(TargetTypeEnum.Variable, '', serviceIdentifier, new Metadata(key, value));
-    var context = new Context(container);
-    var request = new Request(serviceIdentifier, context, null, [], target);
-    return request;
-}
-export { plan, createMockRequest, getBindingDictionary };
+import { ClassElementMetadataKind, getClassElementMetadataFromLegacyMetadata, LegacyTargetImpl as TargetImpl, } from '@inversifyjs/core';
+import { BindingCount } from '../bindings/binding_count';
+import * as ERROR_MSGS from '../constants/error_msgs';
+import { BindingTypeEnum } from '../constants/literal_types';
+import * as METADATA_KEY from '../constants/metadata_keys';
+import { isStackOverflowException } from '../utils/exceptions';
+import { circularDependencyToException, getServiceIdentifierAsString, listMetadataForTarget, listRegisteredBindingsForServiceIdentifier, } from '../utils/serialization';
+import { Context } from './context';
+import { Metadata } from './metadata';
+import { Plan } from './plan';
+import { getBaseClassDependencyCount, getDependencies, getFunctionName, } from './reflection_utils';
+import { Request } from './request';
+function getBindingDictionary(cntnr) {
+    return cntnr._bindingDictionary;
+}
+function _createTarget(isMultiInject, targetType, serviceIdentifier, name, key, value) {
+    var metadataList = _getTargetMetadata(isMultiInject, serviceIdentifier, key, value);
+    var classElementMetadata = getClassElementMetadataFromLegacyMetadata(metadataList);
+    if (classElementMetadata.kind === ClassElementMetadataKind.unmanaged) {
+        throw new Error('Unexpected metadata when creating target');
+    }
+    var target = new TargetImpl(name, classElementMetadata, targetType);
+    return target;
+}
+function _getActiveBindings(metadataReader, avoidConstraints, context, parentRequest, target) {
+    var bindings = getBindings(context.container, target.serviceIdentifier);
+    var activeBindings = [];
+    if (bindings.length === BindingCount.NoBindingsAvailable &&
+        context.container.options.autoBindInjectable === true &&
+        typeof target.serviceIdentifier === 'function' &&
+        metadataReader.getConstructorMetadata(target.serviceIdentifier)
+            .compilerGeneratedMetadata) {
+        context.container.bind(target.serviceIdentifier).toSelf();
+        bindings = getBindings(context.container, target.serviceIdentifier);
+    }
+    if (!avoidConstraints) {
+        activeBindings = bindings.filter(function (binding) {
+            var request = new Request(binding.serviceIdentifier, context, parentRequest, binding, target);
+            return binding.constraint(request);
+        });
+    }
+    else {
+        activeBindings = bindings;
+    }
+    _validateActiveBindingCount(target.serviceIdentifier, activeBindings, target, context.container);
+    return activeBindings;
+}
+function _getTargetMetadata(isMultiInject, serviceIdentifier, key, value) {
+    var metadataKey = isMultiInject
+        ? METADATA_KEY.MULTI_INJECT_TAG
+        : METADATA_KEY.INJECT_TAG;
+    var metadataList = [
+        new Metadata(metadataKey, serviceIdentifier),
+    ];
+    if (key !== undefined) {
+        metadataList.push(new Metadata(key, value));
+    }
+    return metadataList;
+}
+function _validateActiveBindingCount(serviceIdentifier, bindings, target, container) {
+    switch (bindings.length) {
+        case BindingCount.NoBindingsAvailable:
+            if (target.isOptional()) {
+                return bindings;
+            }
+            else {
+                var serviceIdentifierString = getServiceIdentifierAsString(serviceIdentifier);
+                var msg = ERROR_MSGS.NOT_REGISTERED;
+                msg += listMetadataForTarget(serviceIdentifierString, target);
+                msg += listRegisteredBindingsForServiceIdentifier(container, serviceIdentifierString, getBindings);
+                throw new Error(msg);
+            }
+        case BindingCount.OnlyOneBindingAvailable:
+            return bindings;
+        case BindingCount.MultipleBindingsAvailable:
+        default:
+            if (!target.isArray()) {
+                var serviceIdentifierString = getServiceIdentifierAsString(serviceIdentifier);
+                var msg = "".concat(ERROR_MSGS.AMBIGUOUS_MATCH, " ").concat(serviceIdentifierString);
+                msg += listRegisteredBindingsForServiceIdentifier(container, serviceIdentifierString, getBindings);
+                throw new Error(msg);
+            }
+            else {
+                return bindings;
+            }
+    }
+}
+function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, parentRequest, target) {
+    var activeBindings;
+    var childRequest;
+    if (parentRequest === null) {
+        activeBindings = _getActiveBindings(metadataReader, avoidConstraints, context, null, target);
+        childRequest = new Request(serviceIdentifier, context, null, activeBindings, target);
+        var thePlan = new Plan(context, childRequest);
+        context.addPlan(thePlan);
+    }
+    else {
+        activeBindings = _getActiveBindings(metadataReader, avoidConstraints, context, parentRequest, target);
+        childRequest = parentRequest.addChildRequest(target.serviceIdentifier, activeBindings, target);
+    }
+    activeBindings.forEach(function (binding) {
+        var subChildRequest = null;
+        if (target.isArray()) {
+            subChildRequest = childRequest.addChildRequest(binding.serviceIdentifier, binding, target);
+        }
+        else {
+            if (binding.cache !== null) {
+                return;
+            }
+            subChildRequest = childRequest;
+        }
+        if (binding.type === BindingTypeEnum.Instance &&
+            binding.implementationType !== null) {
+            var dependencies = getDependencies(metadataReader, binding.implementationType);
+            if (context.container.options.skipBaseClassChecks !== true) {
+                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);
+            });
+        }
+    });
+}
+function getBindings(container, serviceIdentifier) {
+    var bindings = [];
+    var bindingDictionary = getBindingDictionary(container);
+    if (bindingDictionary.hasKey(serviceIdentifier)) {
+        bindings = bindingDictionary.get(serviceIdentifier);
+    }
+    else if (container.parent !== null) {
+        bindings = getBindings(container.parent, serviceIdentifier);
+    }
+    return bindings;
+}
+function plan(metadataReader, container, isMultiInject, targetType, serviceIdentifier, key, value, avoidConstraints) {
+    if (avoidConstraints === void 0) { avoidConstraints = false; }
+    var context = new Context(container);
+    var target = _createTarget(isMultiInject, targetType, serviceIdentifier, '', key, value);
+    try {
+        _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, null, target);
+        return context;
+    }
+    catch (error) {
+        if (isStackOverflowException(error)) {
+            circularDependencyToException(context.plan.rootRequest);
+        }
+        throw error;
+    }
+}
+function createMockRequest(container, serviceIdentifier, key, value) {
+    var metadataList = _getTargetMetadata(false, serviceIdentifier, key, value);
+    var classElementMetadata = getClassElementMetadataFromLegacyMetadata(metadataList);
+    if (classElementMetadata.kind === ClassElementMetadataKind.unmanaged) {
+        throw new Error('Unexpected metadata when creating target');
+    }
+    var target = new TargetImpl('', classElementMetadata, 'Variable');
+    var context = new Context(container);
+    var request = new Request(serviceIdentifier, context, null, [], target);
+    return request;
+}
+export { plan, createMockRequest, getBindingDictionary };

package/es/planning/queryable_string.js

@@ -1,25 +1,28 @@
-var QueryableString = (function () {
-    function QueryableString(str) {
-        this.str = str;
-    }
-    QueryableString.prototype.startsWith = function (searchString) {
-        return this.str.indexOf(searchString) === 0;
-    };
-    QueryableString.prototype.endsWith = function (searchString) {
-        var reverseString = '';
-        var reverseSearchString = searchString.split('').reverse().join('');
-        reverseString = this.str.split('').reverse().join('');
-        return this.startsWith.call({ str: reverseString }, reverseSearchString);
-    };
-    QueryableString.prototype.contains = function (searchString) {
-        return (this.str.indexOf(searchString) !== -1);
-    };
-    QueryableString.prototype.equals = function (compareString) {
-        return this.str === compareString;
-    };
-    QueryableString.prototype.value = function () {
-        return this.str;
-    };
-    return QueryableString;
-}());
-export { QueryableString };
+var QueryableString = (function () {
+    function QueryableString(str) {
+        this.str = str;
+    }
+    QueryableString.prototype.startsWith = function (searchString) {
+        return this.str.indexOf(searchString) === 0;
+    };
+    QueryableString.prototype.endsWith = function (searchString) {
+        var reverseString = '';
+        var reverseSearchString = searchString
+            .split('')
+            .reverse()
+            .join('');
+        reverseString = this.str.split('').reverse().join('');
+        return this.startsWith.call({ str: reverseString }, reverseSearchString);
+    };
+    QueryableString.prototype.contains = function (searchString) {
+        return this.str.indexOf(searchString) !== -1;
+    };
+    QueryableString.prototype.equals = function (compareString) {
+        return this.str === compareString;
+    };
+    QueryableString.prototype.value = function () {
+        return this.str;
+    };
+    return QueryableString;
+}());
+export { QueryableString };

package/es/planning/reflection_utils.js

@@ -1,135 +1,27 @@
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { LazyServiceIdentifier } from '../annotation/lazy_service_identifier';
-import * as ERROR_MSGS from '../constants/error_msgs';
-import { TargetTypeEnum } from '../constants/literal_types';
-import * as METADATA_KEY from '../constants/metadata_keys';
-import { getFunctionName } from '../utils/serialization';
-import { Target } from './target';
-function getDependencies(metadataReader, func) {
-    var constructorName = getFunctionName(func);
-    return getTargets(metadataReader, constructorName, func, false);
-}
-function getTargets(metadataReader, constructorName, func, isBaseClass) {
-    var metadata = metadataReader.getConstructorMetadata(func);
-    var serviceIdentifiers = metadata.compilerGeneratedMetadata;
-    if (serviceIdentifiers === undefined) {
-        var msg = ERROR_MSGS.MISSING_INJECTABLE_ANNOTATION + " " + constructorName + ".";
-        throw new Error(msg);
-    }
-    var constructorArgsMetadata = metadata.userGeneratedMetadata;
-    var keys = Object.keys(constructorArgsMetadata);
-    var hasUserDeclaredUnknownInjections = (func.length === 0 && keys.length > 0);
-    var hasOptionalParameters = keys.length > func.length;
-    var iterations = (hasUserDeclaredUnknownInjections || hasOptionalParameters) ? keys.length : func.length;
-    var constructorTargets = getConstructorArgsAsTargets(isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata, iterations);
-    var propertyTargets = getClassPropsAsTargets(metadataReader, func, constructorName);
-    var targets = __spreadArray(__spreadArray([], constructorTargets, true), propertyTargets, true);
-    return targets;
-}
-function getConstructorArgsAsTarget(index, isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata) {
-    var targetMetadata = constructorArgsMetadata[index.toString()] || [];
-    var metadata = formatTargetMetadata(targetMetadata);
-    var isManaged = metadata.unmanaged !== true;
-    var serviceIdentifier = serviceIdentifiers[index];
-    var injectIdentifier = metadata.inject || metadata.multiInject;
-    serviceIdentifier = (injectIdentifier ? injectIdentifier : serviceIdentifier);
-    if (serviceIdentifier instanceof LazyServiceIdentifier) {
-        serviceIdentifier = serviceIdentifier.unwrap();
-    }
-    if (isManaged) {
-        var isObject = serviceIdentifier === Object;
-        var isFunction = serviceIdentifier === Function;
-        var isUndefined = serviceIdentifier === undefined;
-        var isUnknownType = isObject || isFunction || isUndefined;
-        if (!isBaseClass && isUnknownType) {
-            var msg = ERROR_MSGS.MISSING_INJECT_ANNOTATION + " argument " + index + " in class " + constructorName + ".";
-            throw new Error(msg);
-        }
-        var target = new Target(TargetTypeEnum.ConstructorArgument, metadata.targetName, serviceIdentifier);
-        target.metadata = targetMetadata;
-        return target;
-    }
-    return null;
-}
-function getConstructorArgsAsTargets(isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata, iterations) {
-    var targets = [];
-    for (var i = 0; i < iterations; i++) {
-        var index = i;
-        var target = getConstructorArgsAsTarget(index, isBaseClass, constructorName, serviceIdentifiers, constructorArgsMetadata);
-        if (target !== null) {
-            targets.push(target);
-        }
-    }
-    return targets;
-}
-function _getServiceIdentifierForProperty(inject, multiInject, propertyName, className) {
-    var serviceIdentifier = (inject || multiInject);
-    if (serviceIdentifier === undefined) {
-        var msg = ERROR_MSGS.MISSING_INJECTABLE_ANNOTATION + " for property " + String(propertyName) + " in class " + className + ".";
-        throw new Error(msg);
-    }
-    return serviceIdentifier;
-}
-function getClassPropsAsTargets(metadataReader, constructorFunc, constructorName) {
-    var classPropsMetadata = metadataReader.getPropertiesMetadata(constructorFunc);
-    var targets = [];
-    var symbolKeys = Object.getOwnPropertySymbols(classPropsMetadata);
-    var stringKeys = Object.keys(classPropsMetadata);
-    var keys = stringKeys.concat(symbolKeys);
-    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-        var key = keys_1[_i];
-        var targetMetadata = classPropsMetadata[key];
-        var metadata = formatTargetMetadata(targetMetadata);
-        var identifier = metadata.targetName || key;
-        var serviceIdentifier = _getServiceIdentifierForProperty(metadata.inject, metadata.multiInject, key, constructorName);
-        var target = new Target(TargetTypeEnum.ClassProperty, identifier, serviceIdentifier);
-        target.metadata = targetMetadata;
-        targets.push(target);
-    }
-    var baseConstructor = Object.getPrototypeOf(constructorFunc.prototype).constructor;
-    if (baseConstructor !== Object) {
-        var baseTargets = getClassPropsAsTargets(metadataReader, baseConstructor, constructorName);
-        targets = __spreadArray(__spreadArray([], targets, true), baseTargets, true);
-    }
-    return targets;
-}
-function getBaseClassDependencyCount(metadataReader, func) {
-    var baseConstructor = Object.getPrototypeOf(func.prototype).constructor;
-    if (baseConstructor !== Object) {
-        var baseConstructorName = getFunctionName(baseConstructor);
-        var targets = getTargets(metadataReader, baseConstructorName, baseConstructor, true);
-        var metadata = targets.map(function (t) { return t.metadata.filter(function (m) { return m.key === METADATA_KEY.UNMANAGED_TAG; }); });
-        var unmanagedCount = [].concat.apply([], metadata).length;
-        var dependencyCount = targets.length - unmanagedCount;
-        if (dependencyCount > 0) {
-            return dependencyCount;
-        }
-        else {
-            return getBaseClassDependencyCount(metadataReader, baseConstructor);
-        }
-    }
-    else {
-        return 0;
-    }
-}
-function formatTargetMetadata(targetMetadata) {
-    var targetMetadataMap = {};
-    targetMetadata.forEach(function (m) {
-        targetMetadataMap[m.key.toString()] = m.value;
-    });
-    return {
-        inject: targetMetadataMap[METADATA_KEY.INJECT_TAG],
-        multiInject: targetMetadataMap[METADATA_KEY.MULTI_INJECT_TAG],
-        targetName: targetMetadataMap[METADATA_KEY.NAME_TAG],
-        unmanaged: targetMetadataMap[METADATA_KEY.UNMANAGED_TAG]
-    };
-}
-export { getDependencies, getBaseClassDependencyCount, getFunctionName };
+import { getTargets } from '@inversifyjs/core';
+import * as METADATA_KEY from '../constants/metadata_keys';
+import { getFunctionName } from '../utils/serialization';
+function getDependencies(metadataReader, func) {
+    return getTargets(metadataReader)(func);
+}
+function getBaseClassDependencyCount(metadataReader, func) {
+    var baseConstructor = Object.getPrototypeOf(func.prototype).constructor;
+    if (baseConstructor !== Object) {
+        var targets = getTargets(metadataReader)(baseConstructor);
+        var metadata = targets.map(function (t) {
+            return t.metadata.filter(function (m) { return m.key === METADATA_KEY.UNMANAGED_TAG; });
+        });
+        var unmanagedCount = [].concat.apply([], metadata).length;
+        var dependencyCount = targets.length - unmanagedCount;
+        if (dependencyCount > 0) {
+            return dependencyCount;
+        }
+        else {
+            return getBaseClassDependencyCount(metadataReader, baseConstructor);
+        }
+    }
+    else {
+        return 0;
+    }
+}
+export { getDependencies, getBaseClassDependencyCount, getFunctionName };

package/es/planning/request.js

@@ -1,22 +1,20 @@
-import { id } from '../utils/id';
-var Request = (function () {
-    function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
-        this.id = id();
-        this.serviceIdentifier = serviceIdentifier;
-        this.parentContext = parentContext;
-        this.parentRequest = parentRequest;
-        this.target = target;
-        this.childRequests = [];
-        this.bindings = (Array.isArray(bindings) ? bindings : [bindings]);
-        this.requestScope = parentRequest === null
-            ? new Map()
-            : null;
-    }
-    Request.prototype.addChildRequest = function (serviceIdentifier, bindings, target) {
-        var child = new Request(serviceIdentifier, this.parentContext, this, bindings, target);
-        this.childRequests.push(child);
-        return child;
-    };
-    return Request;
-}());
-export { Request };
+import { id } from '../utils/id';
+var Request = (function () {
+    function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
+        this.id = id();
+        this.serviceIdentifier = serviceIdentifier;
+        this.parentContext = parentContext;
+        this.parentRequest = parentRequest;
+        this.target = target;
+        this.childRequests = [];
+        this.bindings = Array.isArray(bindings) ? bindings : [bindings];
+        this.requestScope = parentRequest === null ? new Map() : null;
+    }
+    Request.prototype.addChildRequest = function (serviceIdentifier, bindings, target) {
+        var child = new Request(serviceIdentifier, this.parentContext, this, bindings, target);
+        this.childRequests.push(child);
+        return child;
+    };
+    return Request;
+}());
+export { Request };