Merge branch 'main' of github.com:inversify/monorepo into feat/add-re…

…solve-binding-deactivation
inversify · Dec 20, 2024 · cb83c41 · cb83c41
2 parents b5fad23 + 2d7d9bf
commit cb83c41
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/packages/container/libraries/core/src/binding/services/ActivationsService.spec.ts b/packages/container/libraries/core/src/binding/services/ActivationsService.spec.ts
@@ -16,6 +16,7 @@ describe(ActivationsService.name, () => {
     OneToManyMapStar<BindingActivation, BindingActivationRelation>
   >;
 
+  let parentActivationService: ActivationsService;
   let activationsService: ActivationsService;
 
   beforeAll(() => {
@@ -33,7 +34,9 @@ describe(ActivationsService.name, () => {
       OneToManyMapStar<BindingActivation, BindingActivationRelation>
     >;
 
-    activationsService = new ActivationsService();
+    parentActivationService = new ActivationsService(undefined);
+
+    activationsService = new ActivationsService(parentActivationService);
   });
 
   describe('.add', () => {
@@ -80,10 +83,18 @@ describe(ActivationsService.name, () => {
       serviceIdFixture = 'service-identifier';
     });
 
-    describe('when called, and activationMaps.get() returns undefined', () => {
+    describe('when called, and activationMaps.get() returns undefined and parent activationMaps.get() returns Iterable', () => {
+      let bindingActivationFixture: BindingActivation;
+
       let result: unknown;
 
       beforeAll(() => {
+        bindingActivationFixture = Symbol() as unknown as BindingActivation;
+
+        activationMapsMock.get
+          .mockReturnValueOnce(undefined)
+          .mockReturnValueOnce([bindingActivationFixture]);
+
         result = activationsService.get(serviceIdFixture);
       });
 
@@ -92,15 +103,21 @@ describe(ActivationsService.name, () => {
       });
 
       it('should call activationMaps.get()', () => {
-        expect(activationMapsMock.get).toHaveBeenCalledTimes(1);
-        expect(activationMapsMock.get).toHaveBeenCalledWith(
+        expect(activationMapsMock.get).toHaveBeenCalledTimes(2);
+        expect(activationMapsMock.get).toHaveBeenNthCalledWith(
+          1,
+          'serviceId',
+          serviceIdFixture,
+        );
+        expect(activationMapsMock.get).toHaveBeenNthCalledWith(
+          2,
           'serviceId',
           serviceIdFixture,
         );
       });
 
-      it('should return undefined', () => {
-        expect(result).toBeUndefined();
+      it('should return BindingActivation[]', () => {
+        expect(result).toStrictEqual([bindingActivationFixture]);
       });
     });
 

diff --git a/packages/container/libraries/core/src/binding/services/ActivationsService.ts b/packages/container/libraries/core/src/binding/services/ActivationsService.ts
@@ -19,7 +19,9 @@ export class ActivationsService {
     BindingActivationRelation
   >;
 
-  constructor() {
+  readonly #parent: ActivationsService | undefined;
+
+  constructor(parent: ActivationsService | undefined) {
     this.#activationMaps = new OneToManyMapStar<
       BindingActivation,
       BindingActivationRelation
@@ -31,6 +33,8 @@ export class ActivationsService {
         isOptional: false,
       },
     });
+
+    this.#parent = parent;
   }
 
   public add(
@@ -43,17 +47,12 @@ export class ActivationsService {
   public get(
     serviceIdentifier: ServiceIdentifier,
   ): Iterable<BindingActivation> | undefined {
-    const bindings: Iterable<BindingActivation> | undefined =
+    return (
       this.#activationMaps.get(
         ActivationRelationKind.serviceId,
         serviceIdentifier,
-      );
-
-    if (bindings === undefined) {
-      return undefined;
-    }
-
-    return bindings;
+      ) ?? this.#parent?.get(serviceIdentifier)
+    );
   }
 
   public removeAllByModuleId(moduleId: number): void {

diff --git a/packages/container/libraries/core/src/resolution/actions/resolve.int.spec.ts b/packages/container/libraries/core/src/resolution/actions/resolve.int.spec.ts
@@ -197,7 +197,7 @@ describe(resolve.name, () => {
       type: bindingTypeValues.ServiceRedirection,
     };
 
-    activationService = new ActivationsService();
+    activationService = new ActivationsService(undefined);
     bindingService = new BindingService(undefined);
 
     activationService.add(