inversify 6.1.3 → 6.1.4-beta.1

package/CHANGELOG.md

@@ -12,6 +12,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [6.1.4-beta.1]
+
+### Fixed
+- Updated container to allow deactivating singleton undefined values.
+- Updated ESM build to be compatible with both bundler and NodeJS module resolution algorithms.
+
+## [6.1.4-beta.0]
+
+### Changed
+- Updated planner with better error description when a binding can not be properly resolved.
+
 ## [6.1.3]
 
 ### Fixed

package/amd/constants/error_msgs.d.ts

@@ -5,7 +5,7 @@ export declare const KEY_NOT_FOUND: string;
 export declare const AMBIGUOUS_MATCH: string;
 export declare const CANNOT_UNBIND: string;
 export declare const NOT_REGISTERED: string;
-export declare const MISSING_INJECTABLE_ANNOTATION: string;
+export declare const TRYING_TO_RESOLVE_BINDINGS: (name: string) => string;
 export declare const UNDEFINED_INJECT_ANNOTATION: (name: string) => string;
 export declare const CIRCULAR_DEPENDENCY: string;
 export declare const INVALID_BINDING_TYPE: string;

package/amd/constants/error_msgs.js

@@ -1,7 +1,7 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.STACK_OVERFLOW = exports.CIRCULAR_DEPENDENCY_IN_FACTORY = exports.ON_DEACTIVATION_ERROR = exports.PRE_DESTROY_ERROR = exports.POST_CONSTRUCT_ERROR = exports.ASYNC_UNBIND_REQUIRED = exports.MULTIPLE_POST_CONSTRUCT_METHODS = exports.MULTIPLE_PRE_DESTROY_METHODS = exports.CONTAINER_OPTIONS_INVALID_SKIP_BASE_CHECK = exports.CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE = exports.CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE = exports.CONTAINER_OPTIONS_MUST_BE_AN_OBJECT = exports.ARGUMENTS_LENGTH_MISMATCH = exports.INVALID_DECORATOR_OPERATION = exports.INVALID_TO_SELF_VALUE = exports.LAZY_IN_SYNC = exports.INVALID_FUNCTION_BINDING = exports.INVALID_MIDDLEWARE_RETURN = exports.NO_MORE_SNAPSHOTS_AVAILABLE = exports.INVALID_BINDING_TYPE = exports.CIRCULAR_DEPENDENCY = exports.UNDEFINED_INJECT_ANNOTATION = exports.MISSING_INJECTABLE_ANNOTATION = exports.NOT_REGISTERED = exports.CANNOT_UNBIND = exports.AMBIGUOUS_MATCH = exports.KEY_NOT_FOUND = exports.NULL_ARGUMENT = exports.DUPLICATED_METADATA = exports.DUPLICATED_INJECTABLE_DECORATOR = void 0;
+    exports.STACK_OVERFLOW = exports.CIRCULAR_DEPENDENCY_IN_FACTORY = exports.ON_DEACTIVATION_ERROR = exports.PRE_DESTROY_ERROR = exports.POST_CONSTRUCT_ERROR = exports.ASYNC_UNBIND_REQUIRED = exports.MULTIPLE_POST_CONSTRUCT_METHODS = exports.MULTIPLE_PRE_DESTROY_METHODS = exports.CONTAINER_OPTIONS_INVALID_SKIP_BASE_CHECK = exports.CONTAINER_OPTIONS_INVALID_AUTO_BIND_INJECTABLE = exports.CONTAINER_OPTIONS_INVALID_DEFAULT_SCOPE = exports.CONTAINER_OPTIONS_MUST_BE_AN_OBJECT = exports.ARGUMENTS_LENGTH_MISMATCH = exports.INVALID_DECORATOR_OPERATION = exports.INVALID_TO_SELF_VALUE = exports.LAZY_IN_SYNC = exports.INVALID_FUNCTION_BINDING = exports.INVALID_MIDDLEWARE_RETURN = exports.NO_MORE_SNAPSHOTS_AVAILABLE = exports.INVALID_BINDING_TYPE = exports.CIRCULAR_DEPENDENCY = exports.UNDEFINED_INJECT_ANNOTATION = exports.TRYING_TO_RESOLVE_BINDINGS = exports.NOT_REGISTERED = exports.CANNOT_UNBIND = exports.AMBIGUOUS_MATCH = exports.KEY_NOT_FOUND = exports.NULL_ARGUMENT = exports.DUPLICATED_METADATA = exports.DUPLICATED_INJECTABLE_DECORATOR = void 0;
     exports.DUPLICATED_INJECTABLE_DECORATOR = 'Cannot apply @injectable decorator multiple times.';
     exports.DUPLICATED_METADATA = 'Metadata key was used more than once in a parameter:';
     exports.NULL_ARGUMENT = 'NULL argument';
@@ -9,7 +9,8 @@ define(["require", "exports"], function (require, exports) {
     exports.AMBIGUOUS_MATCH = 'Ambiguous match found for serviceIdentifier:';
     exports.CANNOT_UNBIND = 'Could not unbind serviceIdentifier:';
     exports.NOT_REGISTERED = 'No matching bindings found for serviceIdentifier:';
-    exports.MISSING_INJECTABLE_ANNOTATION = 'Missing required @injectable annotation in:';
+    var TRYING_TO_RESOLVE_BINDINGS = function (name) { return "Trying to resolve bindings for \"".concat(name, "\""); };
+    exports.TRYING_TO_RESOLVE_BINDINGS = TRYING_TO_RESOLVE_BINDINGS;
     var UNDEFINED_INJECT_ANNOTATION = function (name) {
         return "@inject called with undefined this could mean that the class ".concat(name, " has ") +
             'a circular dependency problem. You can use a LazyServiceIdentifer to ' +

package/amd/container/container.js

@@ -454,7 +454,8 @@ define(["require", "exports", "../bindings/binding", "../constants/error_msgs",
         };
         Container.prototype._preDestroy = function (constructor, instance) {
             var _a, _b;
-            if (Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)) {
+            if (constructor !== undefined &&
+                Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)) {
                 var data = Reflect.getMetadata(METADATA_KEY.PRE_DESTROY, constructor);
                 return (_b = (_a = instance)[data.value]) === null || _b === void 0 ? void 0 : _b.call(_a);
             }
@@ -469,7 +470,10 @@ define(["require", "exports", "../bindings/binding", "../constants/error_msgs",
         };
         Container.prototype._deactivate = function (binding, instance) {
             var _this = this;
-            var constructor = Object.getPrototypeOf(instance).constructor;
+            var constructor = instance == undefined
+                ? undefined
+                :
+                    Object.getPrototypeOf(instance).constructor;
             try {
                 if (this._deactivations.hasKey(binding.serviceIdentifier)) {
                     var result = this._deactivateContainer(instance, this._deactivations.get(binding.serviceIdentifier).values());
@@ -478,21 +482,21 @@ define(["require", "exports", "../bindings/binding", "../constants/error_msgs",
                             return __generator(this, function (_a) {
                                 return [2, this._propagateContainerDeactivationThenBindingAndPreDestroyAsync(binding, instance, constructor)];
                             });
-                        }); }), constructor);
+                        }); }), binding.serviceIdentifier);
                     }
                 }
                 var propagateDeactivationResult = this._propagateContainerDeactivationThenBindingAndPreDestroy(binding, instance, constructor);
                 if ((0, async_1.isPromise)(propagateDeactivationResult)) {
-                    return this._handleDeactivationError(propagateDeactivationResult, constructor);
+                    return this._handleDeactivationError(propagateDeactivationResult, binding.serviceIdentifier);
                 }
             }
             catch (ex) {
                 if (ex instanceof Error) {
-                    throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex.message));
+                    throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR((0, serialization_1.getServiceIdentifierAsString)(binding.serviceIdentifier), ex.message));
                 }
             }
         };
-        Container.prototype._handleDeactivationError = function (asyncResult, constructor) {
+        Container.prototype._handleDeactivationError = function (asyncResult, serviceIdentifier) {
             return __awaiter(this, void 0, void 0, function () {
                 var ex_1;
                 return __generator(this, function (_a) {
@@ -506,7 +510,7 @@ define(["require", "exports", "../bindings/binding", "../constants/error_msgs",
                         case 2:
                             ex_1 = _a.sent();
                             if (ex_1 instanceof Error) {
-                                throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex_1.message));
+                                throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR((0, serialization_1.getServiceIdentifierAsString)(serviceIdentifier), ex_1.message));
                             }
                             return [3, 3];
                         case 3: return [2];

package/amd/planning/planner.js

@@ -61,7 +61,7 @@ define(["require", "exports", "@inversifyjs/core", "../bindings/binding_count",
         else {
             activeBindings = bindings;
         }
-        _validateActiveBindingCount(target.serviceIdentifier, activeBindings, target, context.container);
+        _validateActiveBindingCount(target.serviceIdentifier, activeBindings, parentRequest, target, context.container);
         return activeBindings;
     }
     function _getTargetMetadata(isMultiInject, serviceIdentifier, key, value) {
@@ -76,7 +76,7 @@ define(["require", "exports", "@inversifyjs/core", "../bindings/binding_count",
         }
         return metadataList;
     }
-    function _validateActiveBindingCount(serviceIdentifier, bindings, target, container) {
+    function _validateActiveBindingCount(serviceIdentifier, bindings, parentRequest, target, container) {
         switch (bindings.length) {
             case binding_count_1.BindingCount.NoBindingsAvailable:
                 if (target.isOptional()) {
@@ -87,6 +87,9 @@ define(["require", "exports", "@inversifyjs/core", "../bindings/binding_count",
                     var 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)));
+                    }
                     throw new Error(msg);
                 }
             case binding_count_1.BindingCount.OnlyOneBindingAvailable:

package/amd/utils/serialization.js

@@ -86,7 +86,7 @@ define(["require", "exports", "../constants/error_msgs"], function (require, exp
     }
     function circularDependencyToException(request) {
         request.childRequests.forEach(function (childRequest) {
-            if (alreadyDependencyChain(childRequest, childRequest.serviceIdentifier)) {
+            if (alreadyDependencyChain(request, childRequest.serviceIdentifier)) {
                 var services = dependencyChainToString(childRequest);
                 throw new Error("".concat(ERROR_MSGS.CIRCULAR_DEPENDENCY, " ").concat(services));
             }

package/es/constants/error_msgs.d.ts

@@ -5,7 +5,7 @@ export declare const KEY_NOT_FOUND: string;
 export declare const AMBIGUOUS_MATCH: string;
 export declare const CANNOT_UNBIND: string;
 export declare const NOT_REGISTERED: string;
-export declare const MISSING_INJECTABLE_ANNOTATION: string;
+export declare const TRYING_TO_RESOLVE_BINDINGS: (name: string) => string;
 export declare const UNDEFINED_INJECT_ANNOTATION: (name: string) => string;
 export declare const CIRCULAR_DEPENDENCY: string;
 export declare const INVALID_BINDING_TYPE: string;

package/es/constants/error_msgs.js

@@ -5,7 +5,7 @@ export var KEY_NOT_FOUND = 'Key Not Found';
 export var AMBIGUOUS_MATCH = 'Ambiguous match found for serviceIdentifier:';
 export var CANNOT_UNBIND = 'Could not unbind serviceIdentifier:';
 export var NOT_REGISTERED = 'No matching bindings found for serviceIdentifier:';
-export var MISSING_INJECTABLE_ANNOTATION = 'Missing required @injectable annotation in:';
+export var TRYING_TO_RESOLVE_BINDINGS = function (name) { return "Trying to resolve bindings for \"".concat(name, "\""); };
 export var UNDEFINED_INJECT_ANNOTATION = function (name) {
     return "@inject called with undefined this could mean that the class ".concat(name, " has ") +
         'a circular dependency problem. You can use a LazyServiceIdentifer to ' +

package/es/container/container.js

@@ -439,7 +439,8 @@ var Container = (function () {
     };
     Container.prototype._preDestroy = function (constructor, instance) {
         var _a, _b;
-        if (Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)) {
+        if (constructor !== undefined &&
+            Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)) {
             var data = Reflect.getMetadata(METADATA_KEY.PRE_DESTROY, constructor);
             return (_b = (_a = instance)[data.value]) === null || _b === void 0 ? void 0 : _b.call(_a);
         }
@@ -454,7 +455,10 @@ var Container = (function () {
     };
     Container.prototype._deactivate = function (binding, instance) {
         var _this = this;
-        var constructor = Object.getPrototypeOf(instance).constructor;
+        var constructor = instance == undefined
+            ? undefined
+            :
+                Object.getPrototypeOf(instance).constructor;
         try {
             if (this._deactivations.hasKey(binding.serviceIdentifier)) {
                 var result = this._deactivateContainer(instance, this._deactivations.get(binding.serviceIdentifier).values());
@@ -463,21 +467,21 @@ var Container = (function () {
                         return __generator(this, function (_a) {
                             return [2, this._propagateContainerDeactivationThenBindingAndPreDestroyAsync(binding, instance, constructor)];
                         });
-                    }); }), constructor);
+                    }); }), binding.serviceIdentifier);
                 }
             }
             var propagateDeactivationResult = this._propagateContainerDeactivationThenBindingAndPreDestroy(binding, instance, constructor);
             if (isPromise(propagateDeactivationResult)) {
-                return this._handleDeactivationError(propagateDeactivationResult, constructor);
+                return this._handleDeactivationError(propagateDeactivationResult, binding.serviceIdentifier);
             }
         }
         catch (ex) {
             if (ex instanceof Error) {
-                throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex.message));
+                throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(getServiceIdentifierAsString(binding.serviceIdentifier), ex.message));
             }
         }
     };
-    Container.prototype._handleDeactivationError = function (asyncResult, constructor) {
+    Container.prototype._handleDeactivationError = function (asyncResult, serviceIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
             var ex_1;
             return __generator(this, function (_a) {
@@ -491,7 +495,7 @@ var Container = (function () {
                     case 2:
                         ex_1 = _a.sent();
                         if (ex_1 instanceof Error) {
-                            throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex_1.message));
+                            throw new Error(ERROR_MSGS.ON_DEACTIVATION_ERROR(getServiceIdentifierAsString(serviceIdentifier), ex_1.message));
                         }
                         return [3, 3];
                     case 3: return [2];