fix(autowire): fix bug with multiple override arguments when autowiring (#218)

Author: zazoomauro

lib/CompilerPass/AutowireOverridePass.js

@@ -19,13 +19,13 @@ export default class AutowireOverridePass {
 
   _processOverride (definitionToOverride, container) {
     const definitionsToOverride = container.instanceManager.searchNotOverrideDefinitionsByObject(definitionToOverride.Object)
+    const referencesToOverride = []
 
     for (const overrideArg of definitionToOverride.overrideArgs) {
-      const references = this._getReferencesForOverrideArg(overrideArg.id)
-
-      for (const [, definitionFromOverride] of definitionsToOverride) {
-        definitionFromOverride.args = [...references]
-      }
+      referencesToOverride.push(...this._getReferencesForOverrideArg(overrideArg.id))
+    }
+    for (const [, definitionFromOverride] of definitionsToOverride) {
+      definitionFromOverride.args = referencesToOverride
     }
   }
 

package.json

@@ -49,7 +49,7 @@
   },
   "homepage": "https://github.com/zazoomauro/node-dependency-injection#readme",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=15.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
@@ -110,4 +110,4 @@
     "instrument": false
   },
   "false": {}
-}
+}

test/Resources-ts/Autowire-Override/config/services-not-exists.yaml

@@ -6,4 +6,4 @@ services:
     App.NoExists:
         class: './FooBarAutowireOverride'
         override_arguments:
-            - '@Caca'
+            - '@NotExists'

test/Resources-ts/Autowire-Override/config/services.yaml

@@ -7,3 +7,12 @@ services:
         class: './FooBarAutowireOverride'
         override_arguments:
             - '@CiAdapter'
+            - '@SomeService'
+            - '@AnotherService'
+
+    App.AnotherFooBarAutowireOverride:
+        class: './AnotherFooBarAutowireOverride'
+        override_arguments:
+            - '@BarAdapter'
+            - '@SomeService'
+            - '@AnotherService'

test/Resources-ts/Autowire-Override/src/AnotherFooBarAutowireOverride.ts

@@ -0,0 +1,20 @@
+import Adapter from "./Adapter";
+import AnotherService from "./AnotherService";
+import SomeService from "./SomeService";
+
+export default class AnotherFooBarAutowireOverride {
+  constructor(
+    private readonly _adapter: Adapter,
+    private readonly _someService: SomeService,
+    private readonly _anotherService: AnotherService
+  ) {
+  }
+
+  getString(): string {
+    return this._adapter.toString();
+  }
+
+  get adapter() {
+    return this._adapter
+  }
+}

test/Resources-ts/Autowire-Override/src/AnotherService.ts

@@ -0,0 +1 @@
+export default class AnotherService {}

test/Resources-ts/Autowire-Override/src/FooBarAutowireOverride.ts

@@ -1,7 +1,14 @@
 import Adapter from "./Adapter";
+import AnotherService from "./AnotherService";
+import SomeService from "./SomeService";
 
 export default class FooBarAutowireOverride {
-  constructor(private readonly _adapter: Adapter) {}
+  constructor(
+    private readonly _adapter: Adapter,
+    private readonly _someService: SomeService,
+    private readonly _anotherService: AnotherService
+  ) {
+  }
 
   getString(): string {
     return this._adapter.toString();

test/Resources-ts/Autowire-Override/src/SomeService.ts

@@ -0,0 +1 @@
+export default class SomeService {}

test/node-dependency-injection/lib-ts/Autowire.spec.js

@@ -26,6 +26,7 @@ import ImplementsTwoPath from '../../Resources-ts/AutowireModulePath/src/Service
 import PathExcludedService from '../../Resources-ts/AutowireModulePath/src/ToExclude/ExcludedService'
 import PathInFolderExcludedService from '../../Resources-ts/AutowireModulePath/src/ToExclude/InFolderExclude/InFolderExcludedService'
 import FooBarAutowireOverride from '../../Resources-ts/Autowire-Override/src/FooBarAutowireOverride'
+import AnotherFooBarAutowireOverride from '../../Resources-ts/Autowire-Override/src/AnotherFooBarAutowireOverride'
 import ServiceFile from '../../../lib/ServiceFile';
 import RootDirectoryNotFound from '../../../lib/Exception/RootDirectoryNotFound';
 
@@ -76,9 +77,11 @@ describe('AutowireTS', () => {
 
         // Act.
         const actual = cb.get(FooBarAutowireOverride)
+        const actualAnother = cb.get(AnotherFooBarAutowireOverride)
 
         // Assert.
         assert.equal(actual.getString(), "ci")
+        assert.equal(actualAnother.getString(), "bar")
       });
 
     it('should get service file when was properly set', () => {