refactor: update decorators to handle pending class metadata count

inversify · Dec 16, 2024 · eb97fda · eb97fda
1 parent 832c935
commit eb97fda
Show file tree

Hide file tree

Showing 16 changed files with 270 additions and 49 deletions.
diff --git a/packages/container/libraries/core/src/metadata/decorators/inject.spec.ts b/packages/container/libraries/core/src/metadata/decorators/inject.spec.ts
@@ -6,6 +6,7 @@ jest.mock('../calculations/buildManagedMetadataFromMaybeClassElementMetadata');
 jest.mock('../calculations/handleInjectionError');
 jest.mock('./injectBase');
 
+import { decrementPendingClassMetadataCount } from '../actions/decrementPendingClassMetadataCount';
 import { buildManagedMetadataFromMaybeClassElementMetadata } from '../calculations/buildManagedMetadataFromMaybeClassElementMetadata';
 import { handleInjectionError } from '../calculations/handleInjectionError';
 import { ClassElementMetadata } from '../models/ClassElementMetadata';
@@ -84,7 +85,10 @@ describe(inject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -164,7 +168,10 @@ describe(inject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {
@@ -253,7 +260,10 @@ describe(inject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -338,7 +348,10 @@ describe(inject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {

diff --git a/packages/container/libraries/core/src/metadata/decorators/inject.ts b/packages/container/libraries/core/src/metadata/decorators/inject.ts
@@ -1,5 +1,6 @@
 import { LazyServiceIdentifier, ServiceIdentifier } from '@inversifyjs/common';
 
+import { decrementPendingClassMetadataCount } from '../actions/decrementPendingClassMetadataCount';
 import { buildManagedMetadataFromMaybeClassElementMetadata } from '../calculations/buildManagedMetadataFromMaybeClassElementMetadata';
 import { handleInjectionError } from '../calculations/handleInjectionError';
 import { ClassElementMetadata } from '../models/ClassElementMetadata';
@@ -24,9 +25,16 @@ export function inject(
   ): void => {
     try {
       if (parameterIndex === undefined) {
-        injectBase(updateMetadata)(target, propertyKey as string | symbol);
+        injectBase(updateMetadata, decrementPendingClassMetadataCount)(
+          target,
+          propertyKey as string | symbol,
+        );
       } else {
-        injectBase(updateMetadata)(target, propertyKey, parameterIndex);
+        injectBase(updateMetadata, decrementPendingClassMetadataCount)(
+          target,
+          propertyKey,
+          parameterIndex,
+        );
       }
     } catch (error: unknown) {
       handleInjectionError(target, propertyKey, parameterIndex, error);

diff --git a/packages/container/libraries/core/src/metadata/decorators/injectBase.spec.ts b/packages/container/libraries/core/src/metadata/decorators/injectBase.spec.ts
@@ -29,6 +29,11 @@ describe(injectBase.name, () => {
       metadata: MaybeClassElementMetadata | undefined,
     ) => MaybeClassElementMetadata
   >;
+  let updatePendingClassMetadataCountMock: jest.Mock<
+    (
+      target: object,
+    ) => (metadata: MaybeClassElementMetadata | undefined) => void
+  >;
 
   beforeAll(() => {
     updateMetadataMock =
@@ -37,6 +42,7 @@ describe(injectBase.name, () => {
           metadata: MaybeClassElementMetadata | undefined,
         ) => MaybeClassElementMetadata
       >();
+    updatePendingClassMetadataCountMock = jest.fn();
   });
 
   describe('when called, as property decorator', () => {
@@ -55,7 +61,7 @@ describe(injectBase.name, () => {
       ).mockReturnValueOnce(updateMaybeClassMetadataPropertyResult);
 
       class TargetFixture {
-        @injectBase(updateMetadataMock)
+        @injectBase(updateMetadataMock, updatePendingClassMetadataCountMock)
         public foo: string | undefined;
       }
 
@@ -94,7 +100,7 @@ describe(injectBase.name, () => {
 
       class TargetFixture {
         constructor(
-          @injectBase(updateMetadataMock)
+          @injectBase(updateMetadataMock, updatePendingClassMetadataCountMock)
           public foo: string | undefined,
         ) {}
       }
@@ -125,7 +131,7 @@ describe(injectBase.name, () => {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         class TargetFixture {
           public doSomethingWithFoo(
-            @injectBase(updateMetadataMock)
+            @injectBase(updateMetadataMock, updatePendingClassMetadataCountMock)
             foo: string | undefined,
           ) {
             console.log(foo ?? '?');

diff --git a/packages/container/libraries/core/src/metadata/decorators/injectBase.ts b/packages/container/libraries/core/src/metadata/decorators/injectBase.ts
@@ -10,27 +10,80 @@ export function injectBase(
   updateMetadata: (
     metadata: MaybeClassElementMetadata | undefined,
   ) => MaybeClassElementMetadata,
+  updatePendingClassMetadataCount: (
+    target: object,
+  ) => (metadata: MaybeClassElementMetadata | undefined) => void,
 ): ParameterDecorator & PropertyDecorator {
   const decorator: ParameterDecorator & PropertyDecorator = (
     target: object,
     propertyKey: string | symbol | undefined,
     parameterIndex?: number,
   ): void => {
     if (parameterIndex === undefined) {
-      injectProperty(updateMetadata)(target, propertyKey as string | symbol);
+      injectProperty(updateMetadata, updatePendingClassMetadataCount)(
+        target,
+        propertyKey as string | symbol,
+      );
     } else {
-      injectParameter(updateMetadata)(target, propertyKey, parameterIndex);
+      injectParameter(updateMetadata, updatePendingClassMetadataCount)(
+        target,
+        propertyKey,
+        parameterIndex,
+      );
     }
   };
 
   return decorator;
 }
 
+function buildComposedUpdateMetadata(
+  updateMetadata: (
+    metadata: MaybeClassElementMetadata | undefined,
+  ) => MaybeClassElementMetadata,
+  updatePendingClassMetadataCount: (
+    target: object,
+  ) => (metadata: MaybeClassElementMetadata | undefined) => void,
+): (
+  target: object,
+) => (
+  metadata: MaybeClassElementMetadata | undefined,
+) => MaybeClassElementMetadata {
+  return (
+    target: object,
+  ): ((
+    metadata: MaybeClassElementMetadata | undefined,
+  ) => MaybeClassElementMetadata) => {
+    const updateTargetPendingClassMetadataCount: (
+      metadata: MaybeClassElementMetadata | undefined,
+    ) => void = updatePendingClassMetadataCount(target);
+
+    return (
+      metadata: MaybeClassElementMetadata | undefined,
+    ): MaybeClassElementMetadata => {
+      updateTargetPendingClassMetadataCount(metadata);
+
+      return updateMetadata(metadata);
+    };
+  };
+}
+
 function injectParameter(
   updateMetadata: (
     metadata: MaybeClassElementMetadata | undefined,
   ) => MaybeClassElementMetadata,
+  updatePendingClassMetadataCount: (
+    target: object,
+  ) => (metadata: MaybeClassElementMetadata | undefined) => void,
 ): ParameterDecorator {
+  const buildComposedUpdateMetadataFromTarget: (
+    target: object,
+  ) => (
+    metadata: MaybeClassElementMetadata | undefined,
+  ) => MaybeClassElementMetadata = buildComposedUpdateMetadata(
+    updateMetadata,
+    updatePendingClassMetadataCount,
+  );
+
   return (
     target: object,
     propertyKey: string | symbol | undefined,
@@ -42,7 +95,7 @@ function injectParameter(
         classMetadataReflectKey,
         getDefaultClassMetadata,
         updateMaybeClassMetadataConstructorArgument(
-          updateMetadata,
+          buildComposedUpdateMetadataFromTarget(target),
           parameterIndex,
         ),
       );
@@ -61,13 +114,28 @@ function injectProperty(
   updateMetadata: (
     metadata: MaybeClassElementMetadata | undefined,
   ) => MaybeClassElementMetadata,
+  updatePendingClassMetadataCount: (
+    target: object,
+  ) => (metadata: MaybeClassElementMetadata | undefined) => void,
 ): PropertyDecorator {
+  const buildComposedUpdateMetadataFromTarget: (
+    target: object,
+  ) => (
+    metadata: MaybeClassElementMetadata | undefined,
+  ) => MaybeClassElementMetadata = buildComposedUpdateMetadata(
+    updateMetadata,
+    updatePendingClassMetadataCount,
+  );
+
   return (target: object, propertyKey: string | symbol): void => {
     updateReflectMetadata(
       target.constructor,
       classMetadataReflectKey,
       getDefaultClassMetadata,
-      updateMaybeClassMetadataProperty(updateMetadata, propertyKey),
+      updateMaybeClassMetadataProperty(
+        buildComposedUpdateMetadataFromTarget(target),
+        propertyKey,
+      ),
     );
   };
 }

diff --git a/packages/container/libraries/core/src/metadata/decorators/multiInject.spec.ts b/packages/container/libraries/core/src/metadata/decorators/multiInject.spec.ts
@@ -6,6 +6,7 @@ jest.mock('../calculations/buildManagedMetadataFromMaybeClassElementMetadata');
 jest.mock('../calculations/handleInjectionError');
 jest.mock('./injectBase');
 
+import { decrementPendingClassMetadataCount } from '../actions/decrementPendingClassMetadataCount';
 import { buildManagedMetadataFromMaybeClassElementMetadata } from '../calculations/buildManagedMetadataFromMaybeClassElementMetadata';
 import { handleInjectionError } from '../calculations/handleInjectionError';
 import { ClassElementMetadata } from '../models/ClassElementMetadata';
@@ -84,7 +85,10 @@ describe(multiInject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -167,7 +171,10 @@ describe(multiInject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {
@@ -256,7 +263,10 @@ describe(multiInject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -341,7 +351,10 @@ describe(multiInject.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          decrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {

diff --git a/packages/container/libraries/core/src/metadata/decorators/multiInject.ts b/packages/container/libraries/core/src/metadata/decorators/multiInject.ts
@@ -1,5 +1,6 @@
 import { LazyServiceIdentifier, ServiceIdentifier } from '@inversifyjs/common';
 
+import { decrementPendingClassMetadataCount } from '../actions/decrementPendingClassMetadataCount';
 import { buildManagedMetadataFromMaybeClassElementMetadata } from '../calculations/buildManagedMetadataFromMaybeClassElementMetadata';
 import { handleInjectionError } from '../calculations/handleInjectionError';
 import { ClassElementMetadata } from '../models/ClassElementMetadata';
@@ -24,9 +25,16 @@ export function multiInject(
   ): void => {
     try {
       if (parameterIndex === undefined) {
-        injectBase(updateMetadata)(target, propertyKey as string | symbol);
+        injectBase(updateMetadata, decrementPendingClassMetadataCount)(
+          target,
+          propertyKey as string | symbol,
+        );
       } else {
-        injectBase(updateMetadata)(target, propertyKey, parameterIndex);
+        injectBase(updateMetadata, decrementPendingClassMetadataCount)(
+          target,
+          propertyKey,
+          parameterIndex,
+        );
       }
     } catch (error: unknown) {
       handleInjectionError(target, propertyKey, parameterIndex, error);

diff --git a/packages/container/libraries/core/src/metadata/decorators/named.spec.ts b/packages/container/libraries/core/src/metadata/decorators/named.spec.ts
@@ -7,6 +7,7 @@ jest.mock(
 jest.mock('../calculations/handleInjectionError');
 jest.mock('./injectBase');
 
+import { incrementPendingClassMetadataCount } from '../actions/incrementPendingClassMetadataCount';
 import { updateMetadataName } from '../actions/updateMetadataName';
 import { buildMaybeClassElementMetadataFromMaybeClassElementMetadata } from '../calculations/buildMaybeClassElementMetadataFromMaybeClassElementMetadata';
 import { handleInjectionError } from '../calculations/handleInjectionError';
@@ -94,7 +95,10 @@ describe(named.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          incrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -173,7 +177,10 @@ describe(named.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          incrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {
@@ -259,7 +266,10 @@ describe(named.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          incrementPendingClassMetadataCount,
+        );
       });
 
       it('should call injectBaseDecorator()', () => {
@@ -339,7 +349,10 @@ describe(named.name, () => {
 
       it('should call injectBase()', () => {
         expect(injectBase).toHaveBeenCalledTimes(1);
-        expect(injectBase).toHaveBeenCalledWith(updateMetadataMock);
+        expect(injectBase).toHaveBeenCalledWith(
+          updateMetadataMock,
+          incrementPendingClassMetadataCount,
+        );
       });
 
       it('should throw handleInjectionError()', () => {