Allow deactivating undefined singleton constant value services (#1628)

* test: remove unused tsconfig

* style: update test description

* fix: allow deactivating singleton undefined values

* docs: update changelog

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated planner with better error description when a binding can not be properly resolved.
 
 ### Fixed
+- Updated container to allow deactivating singleton undefined values.
 - Updated planner to provide right circular dependent services when such dependencies are detected.
 
 ## [6.1.3]

src/container/container.ts

@@ -530,10 +530,13 @@ class Container implements interfaces.Container {
   }
 
   private _preDestroy(
-    constructor: NewableFunction,
+    constructor: NewableFunction | undefined,
     instance: unknown,
   ): Promise<void> | void {
-    if (Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)) {
+    if (
+      constructor !== undefined &&
+      Reflect.hasMetadata(METADATA_KEY.PRE_DESTROY, constructor)
+    ) {
       const data: interfaces.Metadata = Reflect.getMetadata(
         METADATA_KEY.PRE_DESTROY,
         constructor,
@@ -569,9 +572,11 @@ class Container implements interfaces.Container {
     instance: T,
   ): void | Promise<void> {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const constructor: NewableFunction =
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      Object.getPrototypeOf(instance).constructor;
+    const constructor: NewableFunction | undefined =
+      instance == undefined
+        ? undefined
+        : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+          Object.getPrototypeOf(instance).constructor;
 
     try {
       if (this._deactivations.hasKey(binding.serviceIdentifier)) {
@@ -589,7 +594,7 @@ class Container implements interfaces.Container {
                 constructor,
               ),
             ),
-            constructor,
+            binding.serviceIdentifier,
           );
         }
       }
@@ -604,28 +609,34 @@ class Container implements interfaces.Container {
       if (isPromise(propagateDeactivationResult)) {
         return this._handleDeactivationError(
           propagateDeactivationResult,
-          constructor,
+          binding.serviceIdentifier,
         );
       }
     } catch (ex) {
       if (ex instanceof Error) {
         throw new Error(
-          ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex.message),
+          ERROR_MSGS.ON_DEACTIVATION_ERROR(
+            getServiceIdentifierAsString(binding.serviceIdentifier),
+            ex.message,
+          ),
         );
       }
     }
   }
 
   private async _handleDeactivationError(
     asyncResult: Promise<void>,
-    constructor: NewableFunction,
+    serviceIdentifier: interfaces.ServiceIdentifier,
   ): Promise<void> {
     try {
       await asyncResult;
     } catch (ex) {
       if (ex instanceof Error) {
         throw new Error(
-          ERROR_MSGS.ON_DEACTIVATION_ERROR(constructor.name, ex.message),
+          ERROR_MSGS.ON_DEACTIVATION_ERROR(
+            getServiceIdentifierAsString(serviceIdentifier),
+            ex.message,
+          ),
         );
       }
     }
@@ -917,7 +928,7 @@ class Container implements interfaces.Container {
   private _propagateContainerDeactivationThenBindingAndPreDestroy<T>(
     binding: Binding<T>,
     instance: T,
-    constructor: NewableFunction,
+    constructor: NewableFunction | undefined,
   ): void | Promise<void> {
     if (this.parent) {
       return this._deactivate.bind(this.parent)(binding, instance);
@@ -933,7 +944,7 @@ class Container implements interfaces.Container {
   private async _propagateContainerDeactivationThenBindingAndPreDestroyAsync<T>(
     binding: Binding<T>,
     instance: T,
-    constructor: NewableFunction,
+    constructor: NewableFunction | undefined,
   ): Promise<void> {
     if (this.parent) {
       await this._deactivate.bind(this.parent)(binding, instance);
@@ -961,7 +972,7 @@ class Container implements interfaces.Container {
   private _bindingDeactivationAndPreDestroy<T>(
     binding: Binding<T>,
     instance: T,
-    constructor: NewableFunction,
+    constructor: NewableFunction | undefined,
   ): void | Promise<void> {
     if (typeof binding.onDeactivation === 'function') {
       const result: void | Promise<void> = binding.onDeactivation(instance);
@@ -979,7 +990,7 @@ class Container implements interfaces.Container {
   private async _bindingDeactivationAndPreDestroyAsync<T>(
     binding: Binding<T>,
     instance: T,
-    constructor: NewableFunction,
+    constructor: NewableFunction | undefined,
   ): Promise<void> {
     if (typeof binding.onDeactivation === 'function') {
       await binding.onDeactivation(instance);

test/bugs/issue_1515.test.ts

@@ -8,7 +8,7 @@ import {
 } from '../../src/inversify';
 
 describe('Issue 1515', () => {
-  it('should not throw on false circular dependency', () => {
+  it('should properly throw on circular dependency', () => {
     @injectable()
     class Circle1 {
       constructor(@inject('circle-2') public readonly circle2: unknown) {}

test/bugs/issue_1518.test.ts

@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+
+import { Container } from '../../src/inversify';
+
+describe('Issue 1515', () => {
+  it('should not throw on deactivating undefined singleton values', () => {
+    const container: Container = new Container();
+    const symbol: symbol = Symbol.for('foo');
+    container.bind(symbol).toConstantValue(undefined);
+
+    console.log(container.get(symbol));
+
+    container.unbindAll();
+
+    expect(() => {}).not.to.throw();
+  });
+});