inversify 5.1.1 → 6.0.2

package/es/planning/request.js

@@ -1,23 +1,22 @@
-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 };
-//# sourceMappingURL=request.js.map
+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 };

package/es/planning/target.js

@@ -1,79 +1,81 @@
-import * as METADATA_KEY from "../constants/metadata_keys";
-import { id } from "../utils/id";
-import { Metadata } from "./metadata";
-import { QueryableString } from "./queryable_string";
-var Target = (function () {
-    function Target(type, name, serviceIdentifier, namedOrTagged) {
-        this.id = id();
-        this.type = type;
-        this.serviceIdentifier = serviceIdentifier;
-        this.name = new QueryableString(name || "");
-        this.metadata = new Array();
-        var metadataItem = null;
-        if (typeof namedOrTagged === "string") {
-            metadataItem = new Metadata(METADATA_KEY.NAMED_TAG, namedOrTagged);
-        }
-        else if (namedOrTagged instanceof Metadata) {
-            metadataItem = namedOrTagged;
-        }
-        if (metadataItem !== null) {
-            this.metadata.push(metadataItem);
-        }
-    }
-    Target.prototype.hasTag = function (key) {
-        for (var _i = 0, _a = this.metadata; _i < _a.length; _i++) {
-            var m = _a[_i];
-            if (m.key === key) {
-                return true;
-            }
-        }
-        return false;
-    };
-    Target.prototype.isArray = function () {
-        return this.hasTag(METADATA_KEY.MULTI_INJECT_TAG);
-    };
-    Target.prototype.matchesArray = function (name) {
-        return this.matchesTag(METADATA_KEY.MULTI_INJECT_TAG)(name);
-    };
-    Target.prototype.isNamed = function () {
-        return this.hasTag(METADATA_KEY.NAMED_TAG);
-    };
-    Target.prototype.isTagged = function () {
-        return this.metadata.some(function (metadata) { return METADATA_KEY.NON_CUSTOM_TAG_KEYS.every(function (key) { return metadata.key !== key; }); });
-    };
-    Target.prototype.isOptional = function () {
-        return this.matchesTag(METADATA_KEY.OPTIONAL_TAG)(true);
-    };
-    Target.prototype.getNamedTag = function () {
-        if (this.isNamed()) {
-            return this.metadata.filter(function (m) { return m.key === METADATA_KEY.NAMED_TAG; })[0];
-        }
-        return null;
-    };
-    Target.prototype.getCustomTags = function () {
-        if (this.isTagged()) {
-            return this.metadata.filter(function (metadata) { return METADATA_KEY.NON_CUSTOM_TAG_KEYS.every(function (key) { return metadata.key !== key; }); });
-        }
-        else {
-            return null;
-        }
-    };
-    Target.prototype.matchesNamedTag = function (name) {
-        return this.matchesTag(METADATA_KEY.NAMED_TAG)(name);
-    };
-    Target.prototype.matchesTag = function (key) {
-        var _this = this;
-        return function (value) {
-            for (var _i = 0, _a = _this.metadata; _i < _a.length; _i++) {
-                var m = _a[_i];
-                if (m.key === key && m.value === value) {
-                    return true;
-                }
-            }
-            return false;
-        };
-    };
-    return Target;
-}());
-export { Target };
-//# sourceMappingURL=target.js.map
+import * as METADATA_KEY from '../constants/metadata_keys';
+import { id } from '../utils/id';
+import { getSymbolDescription } from '../utils/serialization';
+import { Metadata } from './metadata';
+import { QueryableString } from './queryable_string';
+var Target = (function () {
+    function Target(type, identifier, serviceIdentifier, namedOrTagged) {
+        this.id = id();
+        this.type = type;
+        this.serviceIdentifier = serviceIdentifier;
+        var queryableName = typeof identifier === 'symbol' ? getSymbolDescription(identifier) : identifier;
+        this.name = new QueryableString(queryableName || '');
+        this.identifier = identifier;
+        this.metadata = new Array();
+        var metadataItem = null;
+        if (typeof namedOrTagged === 'string') {
+            metadataItem = new Metadata(METADATA_KEY.NAMED_TAG, namedOrTagged);
+        }
+        else if (namedOrTagged instanceof Metadata) {
+            metadataItem = namedOrTagged;
+        }
+        if (metadataItem !== null) {
+            this.metadata.push(metadataItem);
+        }
+    }
+    Target.prototype.hasTag = function (key) {
+        for (var _i = 0, _a = this.metadata; _i < _a.length; _i++) {
+            var m = _a[_i];
+            if (m.key === key) {
+                return true;
+            }
+        }
+        return false;
+    };
+    Target.prototype.isArray = function () {
+        return this.hasTag(METADATA_KEY.MULTI_INJECT_TAG);
+    };
+    Target.prototype.matchesArray = function (name) {
+        return this.matchesTag(METADATA_KEY.MULTI_INJECT_TAG)(name);
+    };
+    Target.prototype.isNamed = function () {
+        return this.hasTag(METADATA_KEY.NAMED_TAG);
+    };
+    Target.prototype.isTagged = function () {
+        return this.metadata.some(function (metadata) { return METADATA_KEY.NON_CUSTOM_TAG_KEYS.every(function (key) { return metadata.key !== key; }); });
+    };
+    Target.prototype.isOptional = function () {
+        return this.matchesTag(METADATA_KEY.OPTIONAL_TAG)(true);
+    };
+    Target.prototype.getNamedTag = function () {
+        if (this.isNamed()) {
+            return this.metadata.filter(function (m) { return m.key === METADATA_KEY.NAMED_TAG; })[0];
+        }
+        return null;
+    };
+    Target.prototype.getCustomTags = function () {
+        if (this.isTagged()) {
+            return this.metadata.filter(function (metadata) { return METADATA_KEY.NON_CUSTOM_TAG_KEYS.every(function (key) { return metadata.key !== key; }); });
+        }
+        else {
+            return null;
+        }
+    };
+    Target.prototype.matchesNamedTag = function (name) {
+        return this.matchesTag(METADATA_KEY.NAMED_TAG)(name);
+    };
+    Target.prototype.matchesTag = function (key) {
+        var _this = this;
+        return function (value) {
+            for (var _i = 0, _a = _this.metadata; _i < _a.length; _i++) {
+                var m = _a[_i];
+                if (m.key === key && m.value === value) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    };
+    return Target;
+}());
+export { Target };

package/es/resolution/instantiation.js

@@ -1,54 +1,190 @@
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
-};
-import { POST_CONSTRUCT_ERROR } from "../constants/error_msgs";
-import { TargetTypeEnum } from "../constants/literal_types";
-import * as METADATA_KEY from "../constants/metadata_keys";
-function _injectProperties(instance, childRequests, resolveRequest) {
-    var propertyInjectionsRequests = childRequests.filter(function (childRequest) {
-        return (childRequest.target !== null &&
-            childRequest.target.type === TargetTypeEnum.ClassProperty);
-    });
-    var propertyInjections = propertyInjectionsRequests.map(resolveRequest);
-    propertyInjectionsRequests.forEach(function (r, index) {
-        var propertyName = "";
-        propertyName = r.target.name.value();
-        var injection = propertyInjections[index];
-        instance[propertyName] = injection;
-    });
-    return instance;
-}
-function _createInstance(Func, injections) {
-    return new (Func.bind.apply(Func, __spreadArray([void 0], injections)))();
-}
-function _postConstruct(constr, result) {
-    if (Reflect.hasMetadata(METADATA_KEY.POST_CONSTRUCT, constr)) {
-        var data = Reflect.getMetadata(METADATA_KEY.POST_CONSTRUCT, constr);
-        try {
-            result[data.value]();
-        }
-        catch (e) {
-            throw new Error(POST_CONSTRUCT_ERROR(constr.name, e.message));
-        }
-    }
-}
-function resolveInstance(constr, childRequests, resolveRequest) {
-    var result = null;
-    if (childRequests.length > 0) {
-        var constructorInjectionsRequests = childRequests.filter(function (childRequest) {
-            return (childRequest.target !== null && childRequest.target.type === TargetTypeEnum.ConstructorArgument);
-        });
-        var constructorInjections = constructorInjectionsRequests.map(resolveRequest);
-        result = _createInstance(constr, constructorInjections);
-        result = _injectProperties(result, childRequests, resolveRequest);
-    }
-    else {
-        result = new constr();
-    }
-    _postConstruct(constr, result);
-    return result;
-}
-export { resolveInstance };
-//# sourceMappingURL=instantiation.js.map
+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 __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;
+    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 = 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));
+};
+import { ON_DEACTIVATION_ERROR, POST_CONSTRUCT_ERROR, PRE_DESTROY_ERROR } from '../constants/error_msgs';
+import { BindingScopeEnum, TargetTypeEnum } from '../constants/literal_types';
+import * as METADATA_KEY from '../constants/metadata_keys';
+import { isPromise, isPromiseOrContainsPromise } from '../utils/async';
+function _resolveRequests(childRequests, resolveRequest) {
+    return childRequests.reduce(function (resolvedRequests, childRequest) {
+        var injection = resolveRequest(childRequest);
+        var targetType = childRequest.target.type;
+        if (targetType === TargetTypeEnum.ConstructorArgument) {
+            resolvedRequests.constructorInjections.push(injection);
+        }
+        else {
+            resolvedRequests.propertyRequests.push(childRequest);
+            resolvedRequests.propertyInjections.push(injection);
+        }
+        if (!resolvedRequests.isAsync) {
+            resolvedRequests.isAsync = isPromiseOrContainsPromise(injection);
+        }
+        return resolvedRequests;
+    }, { constructorInjections: [], propertyInjections: [], propertyRequests: [], isAsync: false });
+}
+function _createInstance(constr, childRequests, resolveRequest) {
+    var result;
+    if (childRequests.length > 0) {
+        var resolved = _resolveRequests(childRequests, resolveRequest);
+        var createInstanceWithInjectionsArg = __assign(__assign({}, resolved), { constr: constr });
+        if (resolved.isAsync) {
+            result = createInstanceWithInjectionsAsync(createInstanceWithInjectionsArg);
+        }
+        else {
+            result = createInstanceWithInjections(createInstanceWithInjectionsArg);
+        }
+    }
+    else {
+        result = new constr();
+    }
+    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];
+        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 }))];
+            }
+        });
+    });
+}
+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)];
+        });
+    });
+}
+function _getInstanceAfterPostConstruct(constr, result) {
+    var postConstructResult = _postConstruct(constr, result);
+    if (isPromise(postConstructResult)) {
+        return postConstructResult.then(function () { return 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);
+        try {
+            return (_b = (_a = instance)[data.value]) === null || _b === void 0 ? void 0 : _b.call(_a);
+        }
+        catch (e) {
+            if (e instanceof Error) {
+                throw new Error(POST_CONSTRUCT_ERROR(constr.name, e.message));
+            }
+        }
+    }
+}
+function _validateInstanceResolution(binding, constr) {
+    if (binding.scope !== BindingScopeEnum.Singleton) {
+        _throwIfHandlingDeactivation(binding, constr);
+    }
+}
+function _throwIfHandlingDeactivation(binding, constr) {
+    var scopeErrorMessage = "Class cannot be instantiated in " + (binding.scope === BindingScopeEnum.Request ?
+        'request' :
+        'transient') + " scope.";
+    if (typeof binding.onDeactivation === 'function') {
+        throw new Error(ON_DEACTIVATION_ERROR(constr.name, scopeErrorMessage));
+    }
+    if (Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constr)) {
+        throw new Error(PRE_DESTROY_ERROR(constr.name, scopeErrorMessage));
+    }
+}
+function resolveInstance(binding, constr, childRequests, resolveRequest) {
+    _validateInstanceResolution(binding, constr);
+    var result = _createInstance(constr, childRequests, resolveRequest);
+    if (isPromise(result)) {
+        return result.then(function (resolvedResult) { return _getInstanceAfterPostConstruct(constr, resolvedResult); });
+    }
+    else {
+        return _getInstanceAfterPostConstruct(constr, result);
+    }
+}
+export { resolveInstance };