Merge pull request #283 from inversify/fix/update-bindng-activation-w…

…ith-missing-resolution-context

Update BindinActivation with missing context

.changeset/nice-kiwis-exist.md

@@ -0,0 +1,5 @@
+---
+"@inversifyjs/core": patch
+---
+
+Updated BindingActivation with missing `ResolutionContext` param

packages/container/libraries/core/src/binding/models/BindingActivation.ts

@@ -1,3 +1,7 @@
+import { ResolutionContext } from '../../resolution/models/ResolutionContext';
 import { Resolved } from '../../resolution/models/Resolved';
 
-export type BindingActivation<T = unknown> = (injectable: T) => Resolved<T>;
+export type BindingActivation<T = unknown> = (
+  context: ResolutionContext,
+  injectable: T,
+) => Resolved<T>;

packages/container/libraries/core/src/resolution/actions/resolveBindingActivations.spec.ts

@@ -4,6 +4,7 @@ jest.mock('./resolveBindingServiceActivations');
 
 import { ConstantValueBindingFixtures } from '../../binding/fixtures/ConstantValueBindingFixtures';
 import { ConstantValueBinding } from '../../binding/models/ConstantValueBinding';
+import { ResolutionContext } from '../models/ResolutionContext';
 import { ResolutionParams } from '../models/ResolutionParams';
 import { resolveBindingActivations } from './resolveBindingActivations';
 import { resolveBindingServiceActivations } from './resolveBindingServiceActivations';
@@ -73,6 +74,7 @@ describe(resolveBindingActivations.name, () => {
     beforeAll(() => {
       onActivationMock = jest.fn();
       paramsMock = {
+        context: Symbol() as unknown as jest.Mocked<ResolutionContext>,
         getActivations: jest.fn(),
         getBindings: jest.fn(),
       } as Partial<
@@ -113,6 +115,14 @@ describe(resolveBindingActivations.name, () => {
         jest.clearAllMocks();
       });
 
+      it('should call binding.onActivation()', () => {
+        expect(onActivationMock).toHaveBeenCalledTimes(1);
+        expect(onActivationMock).toHaveBeenCalledWith(
+          paramsMock.context,
+          resolvedValue,
+        );
+      });
+
       it('should call resolveBindingServiceActivations()', () => {
         expect(resolveBindingServiceActivations).toHaveBeenCalledTimes(1);
         expect(resolveBindingServiceActivations).toHaveBeenCalledWith(

packages/container/libraries/core/src/resolution/actions/resolveBindingActivations.ts

@@ -21,10 +21,10 @@ export function resolveBindingActivations<TActivated>(
     if (isPromise(activationResult)) {
       activationResult = activationResult.then(
         (resolved: SyncResolved<TActivated>): Resolved<TActivated> =>
-          onActivation(resolved),
+          onActivation(params.context, resolved),
       );
     } else {
-      activationResult = onActivation(activationResult);
+      activationResult = onActivation(params.context, activationResult);
     }
   }
 

packages/container/libraries/core/src/resolution/actions/resolveBindingServiceActivations.spec.ts

@@ -3,6 +3,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals';
 import { ServiceIdentifier } from '@inversifyjs/common';
 
 import { BindingActivation } from '../../binding/models/BindingActivation';
+import { ResolutionContext } from '../models/ResolutionContext';
 import { ResolutionParams } from '../models/ResolutionParams';
 import { resolveBindingServiceActivations } from './resolveBindingServiceActivations';
 
@@ -14,6 +15,7 @@ describe(resolveBindingServiceActivations.name, () => {
 
     beforeAll(() => {
       paramsMock = {
+        context: Symbol() as unknown as jest.Mocked<ResolutionContext>,
         getActivations: jest.fn(),
       } as Partial<
         jest.Mocked<ResolutionParams>
@@ -82,7 +84,10 @@ describe(resolveBindingServiceActivations.name, () => {
 
       it('should call activation', () => {
         expect(activationMock).toHaveBeenCalledTimes(1);
-        expect(activationMock).toHaveBeenCalledWith(valueFixture);
+        expect(activationMock).toHaveBeenCalledWith(
+          paramsMock.context,
+          valueFixture,
+        );
       });
 
       it('should return value', () => {
@@ -125,7 +130,10 @@ describe(resolveBindingServiceActivations.name, () => {
 
       it('should call activation', () => {
         expect(activationMock).toHaveBeenCalledTimes(1);
-        expect(activationMock).toHaveBeenCalledWith(valueFixture);
+        expect(activationMock).toHaveBeenCalledWith(
+          paramsMock.context,
+          valueFixture,
+        );
       });
 
       it('should return value', () => {
@@ -209,7 +217,10 @@ describe(resolveBindingServiceActivations.name, () => {
 
       it('should call activation', () => {
         expect(activationMock).toHaveBeenCalledTimes(1);
-        expect(activationMock).toHaveBeenCalledWith(valueFixture);
+        expect(activationMock).toHaveBeenCalledWith(
+          paramsMock.context,
+          valueFixture,
+        );
       });
 
       it('should return value', () => {
@@ -252,7 +263,10 @@ describe(resolveBindingServiceActivations.name, () => {
 
       it('should call activation', () => {
         expect(activationMock).toHaveBeenCalledTimes(1);
-        expect(activationMock).toHaveBeenCalledWith(valueFixture);
+        expect(activationMock).toHaveBeenCalledWith(
+          paramsMock.context,
+          valueFixture,
+        );
       });
 
       it('should return value', () => {

packages/container/libraries/core/src/resolution/actions/resolveBindingServiceActivations.ts

@@ -18,18 +18,21 @@ export function resolveBindingServiceActivations<TActivated>(
 
   if (isPromise(value)) {
     return resolveBindingActivationsFromIteratorAsync(
+      params,
       value,
       activations[Symbol.iterator](),
     );
   }
 
   return resolveBindingActivationsFromIterator(
+    params,
     value,
     activations[Symbol.iterator](),
   );
 }
 
 function resolveBindingActivationsFromIterator<TActivated>(
+  params: ResolutionParams,
   value: SyncResolved<TActivated>,
   activationsIterator: Iterator<BindingActivation<TActivated>>,
 ): Resolved<TActivated> {
@@ -40,10 +43,11 @@ function resolveBindingActivationsFromIterator<TActivated>(
 
   while (activationIteratorResult.done !== true) {
     const nextActivatedValue: Resolved<TActivated> =
-      activationIteratorResult.value(activatedValue);
+      activationIteratorResult.value(params.context, activatedValue);
 
     if (isPromise(nextActivatedValue)) {
       return resolveBindingActivationsFromIteratorAsync(
+        params,
         nextActivatedValue,
         activationsIterator,
       );
@@ -58,6 +62,7 @@ function resolveBindingActivationsFromIterator<TActivated>(
 }
 
 async function resolveBindingActivationsFromIteratorAsync<TActivated>(
+  params: ResolutionParams,
   value: Promise<TActivated>,
   activationsIterator: Iterator<BindingActivation<TActivated>>,
 ): Promise<SyncResolved<TActivated>> {
@@ -67,7 +72,10 @@ async function resolveBindingActivationsFromIteratorAsync<TActivated>(
     activationsIterator.next();
 
   while (activationIteratorResult.done !== true) {
-    activatedValue = await activationIteratorResult.value(activatedValue);
+    activatedValue = await activationIteratorResult.value(
+      params.context,
+      activatedValue,
+    );
 
     activationIteratorResult = activationsIterator.next();
   }

packages/container/tools/e2e-tests/src/warrior/actions/upgradeWeapon.ts

@@ -1,6 +1,11 @@
+import { ResolutionContext } from '@inversifyjs/core';
+
 import { Weapon } from '../models/Weapon';
 
-export function upgradeWeapon(weapon: Weapon): Weapon {
+export function upgradeWeapon(
+  _context: ResolutionContext,
+  weapon: Weapon,
+): Weapon {
   weapon.damage += 2;
 
   return weapon;