inversify · notaphplover · Jan 16, 2025 · Jan 16, 2025
diff --git a/.changeset/fair-flies-run.md b/.changeset/fair-flies-run.md
@@ -0,0 +1,5 @@
+---
+"@inversifyjs/core": minor
+---
+
+Updated plan related error messages with binding metadata details
diff --git a/...s/container/libraries/core/src/planning/calculations/buildFilteredServiceBindings.spec.ts b/...s/container/libraries/core/src/planning/calculations/buildFilteredServiceBindings.spec.ts
@@ -1,10 +1,9 @@
 import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals';
 
 import { Binding } from '../../binding/models/Binding';
-import { InternalBindingMetadata } from '../../binding/models/BindingMetadataImplementation';
+import { BindingMetadata } from '../../binding/models/BindingMetadata';
 import { bindingScopeValues } from '../../binding/models/BindingScope';
 import { bindingTypeValues } from '../../binding/models/BindingType';
-import { SingleInmutableLinkedList } from '../../common/models/SingleInmutableLinkedList';
 import { BasePlanParams } from '../models/BasePlanParams';
 import {
   buildFilteredServiceBindings,
@@ -14,24 +13,18 @@ import {
 describe(buildFilteredServiceBindings.name, () => {
   describe('having no options', () => {
     let paramsMock: jest.Mocked<BasePlanParams>;
-    let bindingMetadataListFixture: SingleInmutableLinkedList<InternalBindingMetadata>;
+    let bindingMetadataFixture: BindingMetadata;
 
     beforeAll(() => {
       paramsMock = {
         getBindings: jest.fn(),
       } as Partial<jest.Mocked<BasePlanParams>> as jest.Mocked<BasePlanParams>;
-      bindingMetadataListFixture = {
-        last: {
-          elem: {
-            name: 'name',
-            serviceIdentifier: 'service-id',
-            tags: new Map(),
-          },
-          previous: undefined,
-        },
-      } as Partial<
-        SingleInmutableLinkedList<InternalBindingMetadata>
-      > as SingleInmutableLinkedList<InternalBindingMetadata>;
+      bindingMetadataFixture = {
+        getAncestor: () => undefined,
+        name: 'name',
+        serviceIdentifier: 'service-id',
+        tags: new Map(),
+      };
     });
 
     describe('when called, and params.getBinding() returns undefined', () => {
@@ -40,7 +33,7 @@ describe(buildFilteredServiceBindings.name, () => {
       beforeAll(() => {
         result = buildFilteredServiceBindings(
           paramsMock,
-          bindingMetadataListFixture,
+          bindingMetadataFixture,
         );
       });
 
@@ -51,7 +44,7 @@ describe(buildFilteredServiceBindings.name, () => {
       it('should call params.getBinding()', () => {
         expect(paramsMock.getBindings).toHaveBeenCalledTimes(1);
         expect(paramsMock.getBindings).toHaveBeenCalledWith(
-          bindingMetadataListFixture.last.elem.serviceIdentifier,
+          bindingMetadataFixture.serviceIdentifier,
         );
       });
 
@@ -86,7 +79,7 @@ describe(buildFilteredServiceBindings.name, () => {
 
         result = buildFilteredServiceBindings(
           paramsMock,
-          bindingMetadataListFixture,
+          bindingMetadataFixture,
         );
       });
 
@@ -97,7 +90,7 @@ describe(buildFilteredServiceBindings.name, () => {
       it('should call params.getBinding()', () => {
         expect(paramsMock.getBindings).toHaveBeenCalledTimes(1);
         expect(paramsMock.getBindings).toHaveBeenCalledWith(
-          bindingMetadataListFixture.last.elem.serviceIdentifier,
+          bindingMetadataFixture.serviceIdentifier,
         );
       });
 
@@ -109,25 +102,19 @@ describe(buildFilteredServiceBindings.name, () => {
 
   describe('having options with customServiceIdentifier', () => {
     let paramsMock: jest.Mocked<BasePlanParams>;
-    let bindingMetadataListFixture: SingleInmutableLinkedList<InternalBindingMetadata>;
+    let bindingMetadataFixture: BindingMetadata;
     let optionsFixture: BuildFilteredServiceBindingsOptions;
 
     beforeAll(() => {
       paramsMock = {
         getBindings: jest.fn(),
       } as Partial<jest.Mocked<BasePlanParams>> as jest.Mocked<BasePlanParams>;
-      bindingMetadataListFixture = {
-        last: {
-          elem: {
-            name: 'name',
-            serviceIdentifier: 'service-id',
-            tags: new Map(),
-          },
-          previous: undefined,
-        },
-      } as Partial<
-        SingleInmutableLinkedList<InternalBindingMetadata>
-      > as SingleInmutableLinkedList<InternalBindingMetadata>;
+      bindingMetadataFixture = {
+        getAncestor: () => undefined,
+        name: 'name',
+        serviceIdentifier: 'service-id',
+        tags: new Map(),
+      };
       optionsFixture = {
         customServiceIdentifier: 'custom-service-id',
       };
@@ -139,7 +126,7 @@ describe(buildFilteredServiceBindings.name, () => {
       beforeAll(() => {
         result = buildFilteredServiceBindings(
           paramsMock,
-          bindingMetadataListFixture,
+          bindingMetadataFixture,
           optionsFixture,
         );
       });

diff --git a/packages/container/libraries/core/src/planning/calculations/buildFilteredServiceBindings.ts b/packages/container/libraries/core/src/planning/calculations/buildFilteredServiceBindings.ts
@@ -1,11 +1,7 @@
 import { ServiceIdentifier } from '@inversifyjs/common';
 
 import { Binding } from '../../binding/models/Binding';
-import {
-  BindingMetadataImplementation,
-  InternalBindingMetadata,
-} from '../../binding/models/BindingMetadataImplementation';
-import { SingleInmutableLinkedList } from '../../common/models/SingleInmutableLinkedList';
+import { BindingMetadata } from '../../binding/models/BindingMetadata';
 import { BasePlanParams } from '../models/BasePlanParams';
 
 export interface BuildFilteredServiceBindingsOptions {
@@ -14,12 +10,9 @@ export interface BuildFilteredServiceBindingsOptions {
 
 export function buildFilteredServiceBindings(
   params: BasePlanParams,
-  bindingMetadataList: SingleInmutableLinkedList<InternalBindingMetadata>,
+  bindingMetadata: BindingMetadata,
   options?: BuildFilteredServiceBindingsOptions,
 ): Binding<unknown>[] {
-  const bindingMetadata: BindingMetadataImplementation =
-    new BindingMetadataImplementation(bindingMetadataList.last);
-
   const serviceIdentifier: ServiceIdentifier =
     options?.customServiceIdentifier ?? bindingMetadata.serviceIdentifier;
 

diff --git a/...anning/calculations/checkPlanServiceRedirectionBindingNodeSingleInjectionBindings.spec.ts b/...anning/calculations/checkPlanServiceRedirectionBindingNodeSingleInjectionBindings.spec.ts
@@ -3,9 +3,11 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals';
 jest.mock('./isPlanServiceRedirectionBindingNode');
 jest.mock('./throwErrorWhenUnexpectedBindingsAmountFound');
 
+import { BindingMetadata } from '../../binding/models/BindingMetadata';
 import { bindingScopeValues } from '../../binding/models/BindingScope';
 import { bindingTypeValues } from '../../binding/models/BindingType';
 import { ServiceRedirectionBinding } from '../../binding/models/ServiceRedirectionBinding';
+import { MetadataTag } from '../../metadata/models/MetadataTag';
 import { BindingNodeParent } from '../models/BindingNodeParent';
 import { PlanServiceRedirectionBindingNode } from '../models/PlanServiceRedirectionBindingNode';
 import { checkPlanServiceRedirectionBindingNodeSingleInjectionBindings } from './checkPlanServiceRedirectionBindingNodeSingleInjectionBindings';
@@ -18,6 +20,7 @@ describe(
     describe('having a PlanServiceRedirectionBindingNode with no redirections', () => {
       let planServiceRedirectionBindingNodeFixture: PlanServiceRedirectionBindingNode;
       let isOptionalFixture: boolean;
+      let bindingMetadataFixture: BindingMetadata;
 
       beforeAll(() => {
         planServiceRedirectionBindingNodeFixture = {
@@ -27,6 +30,15 @@ describe(
           redirections: [],
         };
         isOptionalFixture = false;
+        bindingMetadataFixture = {
+          getAncestor: () => undefined,
+          name: 'binding-name',
+          serviceIdentifier: 'service-identifier',
+          tags: new Map<MetadataTag, unknown>([
+            ['tag1', 'value1'],
+            ['tag2', 'value2'],
+          ]),
+        };
       });
 
       describe('when called', () => {
@@ -37,6 +49,7 @@ describe(
             checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
               planServiceRedirectionBindingNodeFixture,
               isOptionalFixture,
+              bindingMetadataFixture,
             );
         });
 
@@ -54,6 +67,7 @@ describe(
             planServiceRedirectionBindingNodeFixture.redirections,
             isOptionalFixture,
             planServiceRedirectionBindingNodeFixture,
+            bindingMetadataFixture,
           );
         });
 
@@ -66,6 +80,7 @@ describe(
     describe('having a PlanServiceRedirectionBindingNode with a single redirection to a leaf node', () => {
       let planServiceRedirectionBindingNodeFixture: PlanServiceRedirectionBindingNode;
       let isOptionalFixture: boolean;
+      let bindingMetadataFixture: BindingMetadata;
 
       beforeAll(() => {
         planServiceRedirectionBindingNodeFixture = {
@@ -94,6 +109,15 @@ describe(
           ],
         };
         isOptionalFixture = false;
+        bindingMetadataFixture = {
+          getAncestor: () => undefined,
+          name: 'binding-name',
+          serviceIdentifier: 'service-identifier',
+          tags: new Map<MetadataTag, unknown>([
+            ['tag1', 'value1'],
+            ['tag2', 'value2'],
+          ]),
+        };
       });
 
       describe('when called, and isPlanServiceRedirectionBindingNode() returns false', () => {
@@ -110,6 +134,7 @@ describe(
             checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
               planServiceRedirectionBindingNodeFixture,
               isOptionalFixture,
+              bindingMetadataFixture,
             );
         });
 
@@ -133,6 +158,7 @@ describe(
       let planServiceRedirectionBindingNodeRedirectionFixture: PlanServiceRedirectionBindingNode;
       let planServiceRedirectionBindingNodeFixture: PlanServiceRedirectionBindingNode;
       let isOptionalFixture: boolean;
+      let bindingMetadataFixture: BindingMetadata;
 
       beforeAll(() => {
         planServiceRedirectionBindingNodeRedirectionFixture = {
@@ -148,6 +174,15 @@ describe(
           redirections: [planServiceRedirectionBindingNodeRedirectionFixture],
         };
         isOptionalFixture = false;
+        bindingMetadataFixture = {
+          getAncestor: () => undefined,
+          name: 'binding-name',
+          serviceIdentifier: 'service-identifier',
+          tags: new Map<MetadataTag, unknown>([
+            ['tag1', 'value1'],
+            ['tag2', 'value2'],
+          ]),
+        };
       });
 
       describe('when called, and isPlanServiceRedirectionBindingNode() returns true', () => {
@@ -164,6 +199,7 @@ describe(
             checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
               planServiceRedirectionBindingNodeFixture,
               isOptionalFixture,
+              bindingMetadataFixture,
             );
         });
 
@@ -181,6 +217,7 @@ describe(
             planServiceRedirectionBindingNodeRedirectionFixture.redirections,
             isOptionalFixture,
             planServiceRedirectionBindingNodeRedirectionFixture,
+            bindingMetadataFixture,
           );
         });
 

diff --git a/...rc/planning/calculations/checkPlanServiceRedirectionBindingNodeSingleInjectionBindings.ts b/...rc/planning/calculations/checkPlanServiceRedirectionBindingNodeSingleInjectionBindings.ts
@@ -1,3 +1,4 @@
+import { BindingMetadata } from '../../binding/models/BindingMetadata';
 import { PlanBindingNode } from '../models/PlanBindingNode';
 import { PlanServiceRedirectionBindingNode } from '../models/PlanServiceRedirectionBindingNode';
 import { isPlanServiceRedirectionBindingNode } from './isPlanServiceRedirectionBindingNode';
@@ -8,6 +9,7 @@ const SINGLE_INJECTION_BINDINGS: number = 1;
 export function checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
   serviceRedirectionBindingNode: PlanServiceRedirectionBindingNode,
   isOptional: boolean,
+  bindingMetadata: BindingMetadata,
 ): void {
   if (
     serviceRedirectionBindingNode.redirections.length ===
@@ -20,6 +22,7 @@ export function checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
       checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
         planBindingNode,
         isOptional,
+        bindingMetadata,
       );
     }
 
@@ -30,5 +33,6 @@ export function checkPlanServiceRedirectionBindingNodeSingleInjectionBindings(
     serviceRedirectionBindingNode.redirections,
     isOptional,
     serviceRedirectionBindingNode,
+    bindingMetadata,
   );
 }