inversify 6.1.4 → 6.1.5-beta.0

package/lib/planning/planner.js

@@ -15,44 +15,54 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.plan = plan;
 exports.createMockRequest = createMockRequest;
 exports.getBindingDictionary = getBindingDictionary;
-var core_1 = require("@inversifyjs/core");
-var binding_count_1 = require("../bindings/binding_count");
-var ERROR_MSGS = __importStar(require("../constants/error_msgs"));
-var literal_types_1 = require("../constants/literal_types");
-var METADATA_KEY = __importStar(require("../constants/metadata_keys"));
-var exceptions_1 = require("../utils/exceptions");
-var serialization_1 = require("../utils/serialization");
-var context_1 = require("./context");
-var metadata_1 = require("./metadata");
-var plan_1 = require("./plan");
-var reflection_utils_1 = require("./reflection_utils");
-var request_1 = require("./request");
+const core_1 = require("@inversifyjs/core");
+const binding_count_1 = require("../bindings/binding_count");
+const ERROR_MSGS = __importStar(require("../constants/error_msgs"));
+const literal_types_1 = require("../constants/literal_types");
+const METADATA_KEY = __importStar(require("../constants/metadata_keys"));
+const exceptions_1 = require("../utils/exceptions");
+const serialization_1 = require("../utils/serialization");
+const context_1 = require("./context");
+const metadata_1 = require("./metadata");
+const plan_1 = require("./plan");
+const reflection_utils_1 = require("./reflection_utils");
+const request_1 = require("./request");
 function getBindingDictionary(cntnr) {
     return cntnr._bindingDictionary;
 }
 function _createTarget(isMultiInject, targetType, serviceIdentifier, name, key, value) {
-    var metadataList = _getTargetMetadata(isMultiInject, serviceIdentifier, key, value);
-    var classElementMetadata = (0, core_1.getClassElementMetadataFromLegacyMetadata)(metadataList);
+    const metadataList = _getTargetMetadata(isMultiInject, serviceIdentifier, key, value);
+    const classElementMetadata = (0, core_1.getClassElementMetadataFromLegacyMetadata)(metadataList);
     if (classElementMetadata.kind === core_1.ClassElementMetadataKind.unmanaged) {
         throw new Error('Unexpected metadata when creating target');
     }
-    var target = new core_1.LegacyTargetImpl(name, classElementMetadata, targetType);
+    const target = new core_1.LegacyTargetImpl(name, classElementMetadata, targetType);
     return target;
 }
 function _getActiveBindings(metadataReader, avoidConstraints, context, parentRequest, target) {
-    var bindings = getBindings(context.container, target.serviceIdentifier);
-    var activeBindings = [];
+    let bindings = getBindings(context.container, target.serviceIdentifier);
+    let activeBindings = [];
     if (bindings.length === binding_count_1.BindingCount.NoBindingsAvailable &&
         context.container.options.autoBindInjectable === true &&
         typeof target.serviceIdentifier === 'function' &&
@@ -62,8 +72,8 @@ function _getActiveBindings(metadataReader, avoidConstraints, context, parentReq
         bindings = getBindings(context.container, target.serviceIdentifier);
     }
     if (!avoidConstraints) {
-        activeBindings = bindings.filter(function (binding) {
-            var request = new request_1.Request(binding.serviceIdentifier, context, parentRequest, binding, target);
+        activeBindings = bindings.filter((binding) => {
+            const request = new request_1.Request(binding.serviceIdentifier, context, parentRequest, binding, target);
             return binding.constraint(request);
         });
     }
@@ -74,10 +84,10 @@ function _getActiveBindings(metadataReader, avoidConstraints, context, parentReq
     return activeBindings;
 }
 function _getTargetMetadata(isMultiInject, serviceIdentifier, key, value) {
-    var metadataKey = isMultiInject
+    const metadataKey = isMultiInject
         ? METADATA_KEY.MULTI_INJECT_TAG
         : METADATA_KEY.INJECT_TAG;
-    var metadataList = [
+    const metadataList = [
         new metadata_1.Metadata(metadataKey, serviceIdentifier),
     ];
     if (key !== undefined) {
@@ -92,12 +102,12 @@ function _validateActiveBindingCount(serviceIdentifier, bindings, parentRequest,
                 return bindings;
             }
             else {
-                var serviceIdentifierString = (0, serialization_1.getServiceIdentifierAsString)(serviceIdentifier);
-                var msg = ERROR_MSGS.NOT_REGISTERED;
+                const serviceIdentifierString = (0, serialization_1.getServiceIdentifierAsString)(serviceIdentifier);
+                let msg = ERROR_MSGS.NOT_REGISTERED;
                 msg += (0, serialization_1.listMetadataForTarget)(serviceIdentifierString, target);
                 msg += (0, serialization_1.listRegisteredBindingsForServiceIdentifier)(container, serviceIdentifierString, getBindings);
                 if (parentRequest !== null) {
-                    msg += "\n".concat(ERROR_MSGS.TRYING_TO_RESOLVE_BINDINGS((0, serialization_1.getServiceIdentifierAsString)(parentRequest.serviceIdentifier)));
+                    msg += `\n${ERROR_MSGS.TRYING_TO_RESOLVE_BINDINGS((0, serialization_1.getServiceIdentifierAsString)(parentRequest.serviceIdentifier))}`;
                 }
                 throw new Error(msg);
             }
@@ -106,8 +116,8 @@ function _validateActiveBindingCount(serviceIdentifier, bindings, parentRequest,
         case binding_count_1.BindingCount.MultipleBindingsAvailable:
         default:
             if (!target.isArray()) {
-                var serviceIdentifierString = (0, serialization_1.getServiceIdentifierAsString)(serviceIdentifier);
-                var msg = "".concat(ERROR_MSGS.AMBIGUOUS_MATCH, " ").concat(serviceIdentifierString);
+                const serviceIdentifierString = (0, serialization_1.getServiceIdentifierAsString)(serviceIdentifier);
+                let msg = `${ERROR_MSGS.AMBIGUOUS_MATCH} ${serviceIdentifierString}`;
                 msg += (0, serialization_1.listRegisteredBindingsForServiceIdentifier)(container, serviceIdentifierString, getBindings);
                 throw new Error(msg);
             }
@@ -117,20 +127,20 @@ function _validateActiveBindingCount(serviceIdentifier, bindings, parentRequest,
     }
 }
 function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, parentRequest, target) {
-    var activeBindings;
-    var childRequest;
+    let activeBindings;
+    let childRequest;
     if (parentRequest === null) {
         activeBindings = _getActiveBindings(metadataReader, avoidConstraints, context, null, target);
         childRequest = new request_1.Request(serviceIdentifier, context, null, activeBindings, target);
-        var thePlan = new plan_1.Plan(context, childRequest);
+        const thePlan = new plan_1.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;
+    activeBindings.forEach((binding) => {
+        let subChildRequest = null;
         if (target.isArray()) {
             subChildRequest = childRequest.addChildRequest(binding.serviceIdentifier, binding, target);
         }
@@ -142,23 +152,23 @@ function _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier,
         }
         if (binding.type === literal_types_1.BindingTypeEnum.Instance &&
             binding.implementationType !== null) {
-            var dependencies = (0, reflection_utils_1.getDependencies)(metadataReader, binding.implementationType);
+            const dependencies = (0, reflection_utils_1.getDependencies)(metadataReader, binding.implementationType);
             if (context.container.options.skipBaseClassChecks !== true) {
-                var baseClassDependencyCount = (0, reflection_utils_1.getBaseClassDependencyCount)(metadataReader, binding.implementationType);
+                const baseClassDependencyCount = (0, reflection_utils_1.getBaseClassDependencyCount)(metadataReader, binding.implementationType);
                 if (dependencies.length < baseClassDependencyCount) {
-                    var error = ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH((0, reflection_utils_1.getFunctionName)(binding.implementationType));
+                    const error = ERROR_MSGS.ARGUMENTS_LENGTH_MISMATCH((0, reflection_utils_1.getFunctionName)(binding.implementationType));
                     throw new Error(error);
                 }
             }
-            dependencies.forEach(function (dependency) {
+            dependencies.forEach((dependency) => {
                 _createSubRequests(metadataReader, false, dependency.serviceIdentifier, context, subChildRequest, dependency);
             });
         }
     });
 }
 function getBindings(container, serviceIdentifier) {
-    var bindings = [];
-    var bindingDictionary = getBindingDictionary(container);
+    let bindings = [];
+    const bindingDictionary = getBindingDictionary(container);
     if (bindingDictionary.hasKey(serviceIdentifier)) {
         bindings = bindingDictionary.get(serviceIdentifier);
     }
@@ -167,10 +177,9 @@ function getBindings(container, serviceIdentifier) {
     }
     return bindings;
 }
-function plan(metadataReader, container, isMultiInject, targetType, serviceIdentifier, key, value, avoidConstraints) {
-    if (avoidConstraints === void 0) { avoidConstraints = false; }
-    var context = new context_1.Context(container);
-    var target = _createTarget(isMultiInject, targetType, serviceIdentifier, '', key, value);
+function plan(metadataReader, container, isMultiInject, targetType, serviceIdentifier, key, value, avoidConstraints = false) {
+    const context = new context_1.Context(container);
+    const target = _createTarget(isMultiInject, targetType, serviceIdentifier, '', key, value);
     try {
         _createSubRequests(metadataReader, avoidConstraints, serviceIdentifier, context, null, target);
         return context;
@@ -183,13 +192,13 @@ function plan(metadataReader, container, isMultiInject, targetType, serviceIdent
     }
 }
 function createMockRequest(container, serviceIdentifier, key, value) {
-    var metadataList = _getTargetMetadata(false, serviceIdentifier, key, value);
-    var classElementMetadata = (0, core_1.getClassElementMetadataFromLegacyMetadata)(metadataList);
+    const metadataList = _getTargetMetadata(false, serviceIdentifier, key, value);
+    const classElementMetadata = (0, core_1.getClassElementMetadataFromLegacyMetadata)(metadataList);
     if (classElementMetadata.kind === core_1.ClassElementMetadataKind.unmanaged) {
         throw new Error('Unexpected metadata when creating target');
     }
-    var target = new core_1.LegacyTargetImpl('', classElementMetadata, 'Variable');
-    var context = new context_1.Context(container);
-    var request = new request_1.Request(serviceIdentifier, context, null, [], target);
+    const target = new core_1.LegacyTargetImpl('', classElementMetadata, 'Variable');
+    const context = new context_1.Context(container);
+    const request = new request_1.Request(serviceIdentifier, context, null, [], target);
     return request;
 }

package/lib/planning/queryable_string.js

@@ -1,31 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryableString = void 0;
-var QueryableString = (function () {
-    function QueryableString(str) {
+class QueryableString {
+    str;
+    constructor(str) {
         this.str = str;
     }
-    QueryableString.prototype.startsWith = function (searchString) {
+    startsWith(searchString) {
         return this.str.indexOf(searchString) === 0;
-    };
-    QueryableString.prototype.endsWith = function (searchString) {
-        var reverseString = '';
-        var reverseSearchString = searchString
+    }
+    endsWith(searchString) {
+        let reverseString = '';
+        const reverseSearchString = searchString
             .split('')
             .reverse()
             .join('');
         reverseString = this.str.split('').reverse().join('');
         return this.startsWith.call({ str: reverseString }, reverseSearchString);
-    };
-    QueryableString.prototype.contains = function (searchString) {
+    }
+    contains(searchString) {
         return this.str.indexOf(searchString) !== -1;
-    };
-    QueryableString.prototype.equals = function (compareString) {
+    }
+    equals(compareString) {
         return this.str === compareString;
-    };
-    QueryableString.prototype.value = function () {
+    }
+    value() {
         return this.str;
-    };
-    return QueryableString;
-}());
+    }
+}
 exports.QueryableString = QueryableString;

package/lib/planning/reflection_utils.js

@@ -15,33 +15,41 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionName = void 0;
 exports.getDependencies = getDependencies;
 exports.getBaseClassDependencyCount = getBaseClassDependencyCount;
-var core_1 = require("@inversifyjs/core");
-var METADATA_KEY = __importStar(require("../constants/metadata_keys"));
-var serialization_1 = require("../utils/serialization");
+const core_1 = require("@inversifyjs/core");
+const METADATA_KEY = __importStar(require("../constants/metadata_keys"));
+const serialization_1 = require("../utils/serialization");
 Object.defineProperty(exports, "getFunctionName", { enumerable: true, get: function () { return serialization_1.getFunctionName; } });
 function getDependencies(metadataReader, func) {
     return (0, core_1.getTargets)(metadataReader)(func);
 }
 function getBaseClassDependencyCount(metadataReader, func) {
-    var baseConstructor = Object.getPrototypeOf(func.prototype).constructor;
+    const baseConstructor = Object.getPrototypeOf(func.prototype).constructor;
     if (baseConstructor !== Object) {
-        var targets = (0, core_1.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;
+        const targets = (0, core_1.getTargets)(metadataReader)(baseConstructor);
+        const metadata = targets.map((t) => t.metadata.filter((m) => m.key === METADATA_KEY.UNMANAGED_TAG));
+        const unmanagedCount = [].concat.apply([], metadata).length;
+        const dependencyCount = targets.length - unmanagedCount;
         if (dependencyCount > 0) {
             return dependencyCount;
         }

package/lib/planning/request.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-var id_1 = require("../utils/id");
-var Request = (function () {
-    function Request(serviceIdentifier, parentContext, parentRequest, bindings, target) {
+const id_1 = require("../utils/id");
+class Request {
+    id;
+    serviceIdentifier;
+    parentContext;
+    parentRequest;
+    bindings;
+    childRequests;
+    target;
+    requestScope;
+    constructor(serviceIdentifier, parentContext, parentRequest, bindings, target) {
         this.id = (0, id_1.id)();
         this.serviceIdentifier = serviceIdentifier;
         this.parentContext = parentContext;
@@ -13,11 +21,10 @@ var Request = (function () {
         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);
+    addChildRequest(serviceIdentifier, bindings, target) {
+        const child = new Request(serviceIdentifier, this.parentContext, this, bindings, target);
         this.childRequests.push(child);
         return child;
-    };
-    return Request;
-}());
+    }
+}
 exports.Request = Request;

package/lib/resolution/instantiation.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -26,68 +15,33 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    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) : adopt(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 = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["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 (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, 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 };
-    }
-};
-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));
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveInstance = resolveInstance;
-var error_msgs_1 = require("../constants/error_msgs");
-var literal_types_1 = require("../constants/literal_types");
-var METADATA_KEY = __importStar(require("../constants/metadata_keys"));
-var async_1 = require("../utils/async");
+const error_msgs_1 = require("../constants/error_msgs");
+const literal_types_1 = require("../constants/literal_types");
+const METADATA_KEY = __importStar(require("../constants/metadata_keys"));
+const async_1 = require("../utils/async");
 function _resolveRequests(childRequests, resolveRequest) {
-    return childRequests.reduce(function (resolvedRequests, childRequest) {
-        var injection = resolveRequest(childRequest);
-        var targetType = childRequest.target.type;
+    return childRequests.reduce((resolvedRequests, childRequest) => {
+        const injection = resolveRequest(childRequest);
+        const targetType = childRequest.target.type;
         if (targetType === literal_types_1.TargetTypeEnum.ConstructorArgument) {
             resolvedRequests.constructorInjections.push(injection);
         }
@@ -107,10 +61,13 @@ function _resolveRequests(childRequests, resolveRequest) {
     });
 }
 function _createInstance(constr, childRequests, resolveRequest) {
-    var result;
+    let result;
     if (childRequests.length > 0) {
-        var resolved = _resolveRequests(childRequests, resolveRequest);
-        var createInstanceWithInjectionsArg = __assign(__assign({}, resolved), { constr: constr });
+        const resolved = _resolveRequests(childRequests, resolveRequest);
+        const createInstanceWithInjectionsArg = {
+            ...resolved,
+            constr,
+        };
         if (resolved.isAsync) {
             result = createInstanceWithInjectionsAsync(createInstanceWithInjectionsArg);
         }
@@ -124,66 +81,51 @@ function _createInstance(constr, childRequests, resolveRequest) {
     return result;
 }
 function createInstanceWithInjections(args) {
-    var _a;
-    var instance = new ((_a = args.constr).bind.apply(_a, __spreadArray([void 0], args.constructorInjections, false)))();
-    args.propertyRequests.forEach(function (r, index) {
-        var property = r.target.identifier;
-        var injection = args.propertyInjections[index];
+    const instance = new args.constr(...args.constructorInjections);
+    args.propertyRequests.forEach((r, index) => {
+        const property = r.target.identifier;
+        const injection = args.propertyInjections[index];
         if (!r.target.isOptional() || injection !== undefined) {
             instance[property] = injection;
         }
     });
     return instance;
 }
-function createInstanceWithInjectionsAsync(args) {
-    return __awaiter(this, void 0, void 0, function () {
-        var constructorInjections, propertyInjections;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4, possiblyWaitInjections(args.constructorInjections)];
-                case 1:
-                    constructorInjections = _a.sent();
-                    return [4, possiblyWaitInjections(args.propertyInjections)];
-                case 2:
-                    propertyInjections = _a.sent();
-                    return [2, createInstanceWithInjections(__assign(__assign({}, args), { constructorInjections: constructorInjections, propertyInjections: propertyInjections }))];
-            }
-        });
+async function createInstanceWithInjectionsAsync(args) {
+    const constructorInjections = await possiblyWaitInjections(args.constructorInjections);
+    const propertyInjections = await possiblyWaitInjections(args.propertyInjections);
+    return createInstanceWithInjections({
+        ...args,
+        constructorInjections,
+        propertyInjections,
     });
 }
-function possiblyWaitInjections(possiblePromiseinjections) {
-    return __awaiter(this, void 0, void 0, function () {
-        var injections, _i, possiblePromiseinjections_1, injection;
-        return __generator(this, function (_a) {
-            injections = [];
-            for (_i = 0, possiblePromiseinjections_1 = possiblePromiseinjections; _i < possiblePromiseinjections_1.length; _i++) {
-                injection = possiblePromiseinjections_1[_i];
-                if (Array.isArray(injection)) {
-                    injections.push(Promise.all(injection));
-                }
-                else {
-                    injections.push(injection);
-                }
-            }
-            return [2, Promise.all(injections)];
-        });
-    });
+async function possiblyWaitInjections(possiblePromiseinjections) {
+    const injections = [];
+    for (const injection of possiblePromiseinjections) {
+        if (Array.isArray(injection)) {
+            injections.push(Promise.all(injection));
+        }
+        else {
+            injections.push(injection);
+        }
+    }
+    return Promise.all(injections);
 }
 function _getInstanceAfterPostConstruct(constr, result) {
-    var postConstructResult = _postConstruct(constr, result);
+    const postConstructResult = _postConstruct(constr, result);
     if ((0, async_1.isPromise)(postConstructResult)) {
-        return postConstructResult.then(function () { return result; });
+        return postConstructResult.then(() => result);
     }
     else {
         return result;
     }
 }
 function _postConstruct(constr, instance) {
-    var _a, _b;
     if (Reflect.hasMetadata(METADATA_KEY.POST_CONSTRUCT, constr)) {
-        var data = Reflect.getMetadata(METADATA_KEY.POST_CONSTRUCT, constr);
+        const data = Reflect.getMetadata(METADATA_KEY.POST_CONSTRUCT, constr);
         try {
-            return (_b = (_a = instance)[data.value]) === null || _b === void 0 ? void 0 : _b.call(_a);
+            return instance[data.value]?.();
         }
         catch (e) {
             if (e instanceof Error) {
@@ -198,7 +140,7 @@ function _validateInstanceResolution(binding, constr) {
     }
 }
 function _throwIfHandlingDeactivation(binding, constr) {
-    var scopeErrorMessage = "Class cannot be instantiated in ".concat(binding.scope === literal_types_1.BindingScopeEnum.Request ? 'request' : 'transient', " scope.");
+    const scopeErrorMessage = `Class cannot be instantiated in ${binding.scope === literal_types_1.BindingScopeEnum.Request ? 'request' : 'transient'} scope.`;
     if (typeof binding.onDeactivation === 'function') {
         throw new Error((0, error_msgs_1.ON_DEACTIVATION_ERROR)(constr.name, scopeErrorMessage));
     }
@@ -208,11 +150,9 @@ function _throwIfHandlingDeactivation(binding, constr) {
 }
 function resolveInstance(binding, constr, childRequests, resolveRequest) {
     _validateInstanceResolution(binding, constr);
-    var result = _createInstance(constr, childRequests, resolveRequest);
+    const result = _createInstance(constr, childRequests, resolveRequest);
     if ((0, async_1.isPromise)(result)) {
-        return result.then(function (resolvedResult) {
-            return _getInstanceAfterPostConstruct(constr, resolvedResult);
-        });
+        return result.then((resolvedResult) => _getInstanceAfterPostConstruct(constr, resolvedResult));
     }
     else {
         return _getInstanceAfterPostConstruct(constr, result);