feat: Make deregistration of injectables variadic

ogre-works · Apr 7, 2022 · 8681a6e · 8681a6e
1 parent d5ee408
commit 8681a6e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/...ages/injectable/src/dependency-injection-container/createContainer.deregistration.test.js b/...ages/injectable/src/dependency-injection-container/createContainer.deregistration.test.js
@@ -19,6 +19,30 @@ describe('createContainer.deregistration', () => {
     }).toThrow('Tried to inject non-registered injectable "some-injectable".');
   });
 
+  it('given multiple registered injectables and deregistered, when injecting, throws', () => {
+    const di = createContainer();
+
+    const someInjectable = getInjectable({
+      id: 'some-injectable',
+      instantiate: () => 'irrelevant',
+    });
+
+    const someOtherInjectable = getInjectable({
+      id: 'some-other-injectable',
+      instantiate: () => 'irrelevant',
+    });
+
+    di.register(someInjectable, someOtherInjectable);
+
+    di.deregister(someInjectable, someOtherInjectable);
+
+    expect(() => {
+      di.inject(someOtherInjectable);
+    }).toThrow(
+      'Tried to inject non-registered injectable "some-other-injectable".',
+    );
+  });
+
   it('given not registered, when still deregistering, throws', () => {
     const di = createContainer();
 

diff --git a/packages/injectable/src/dependency-injection-container/createContainer.js b/packages/injectable/src/dependency-injection-container/createContainer.js
@@ -138,21 +138,23 @@ export default () => {
 
     register: withRegistrationDecorators(nonDecoratedRegister),
 
-    deregister: alias => {
-      if (!injectableMap.has(alias.id)) {
-        throw new Error(
-          `Tried to deregister non-registered injectable "${alias.id}".`,
-        );
-      }
+    deregister: (...aliases) => {
+      aliases.forEach(alias => {
+        if (!injectableMap.has(alias.id)) {
+          throw new Error(
+            `Tried to deregister non-registered injectable "${alias.id}".`,
+          );
+        }
 
-      purgeInstances(alias);
+        purgeInstances(alias);
 
-      injectables = pipeline(injectables, reject(isRelatedTo(alias)));
+        injectables = pipeline(injectables, reject(isRelatedTo(alias)));
 
-      overridingInjectables = pipeline(
-        overridingInjectables,
-        reject(isRelatedTo(alias)),
-      );
+        overridingInjectables = pipeline(
+          overridingInjectables,
+          reject(isRelatedTo(alias)),
+        );
+      });
     },
 
     override: (alias, instantiateStub) => {