Merge branch 'master' of github.com:zazoomauro/node-dependency-injection

Author: zazoomauro

lib/Loader/FileLoader.js

@@ -6,6 +6,7 @@ import validate from 'validate-npm-package-name'
 import Autowire from '../Autowire'
 import Argument from './Argument'
 import Condition from '../Condition'
+import ServiceFile from '../ServiceFile'
 
 class FileLoader {
   /**
@@ -241,6 +242,14 @@ class FileLoader {
         autowire.addExclude(exclude)
       })
     }
+    if (defaults.dumpFile) {
+      let dumpFilePath = defaults.dumpFile
+      if (!path.isAbsolute(dumpFilePath)) {
+        const filePathParsed = path.parse(this.filePath)
+        dumpFilePath = path.join(filePathParsed.dir, dumpFilePath)
+      }
+      autowire.serviceFile = new ServiceFile(dumpFilePath, true)
+    }
     await autowire.process()
   }
 

lib/Loader/XmlFileLoader.js

@@ -182,6 +182,10 @@ export default class XmlFileLoader extends FileLoader {
       defaults.exclude = excludes.map((e) => e['@_pattern'] || e)
     }
 
+    if (defaultsNode['@_dumpFile'] !== undefined) {
+      defaults.dumpFile = defaultsNode['@_dumpFile']
+    }
+
     return defaults
   }
 

test/Resources-ts/Autowire/config/services-dump-file-relative.yaml

@@ -0,0 +1,6 @@
+services:
+    _defaults:
+        autowire: true
+        rootDir: ../src
+        exclude: ["ToExclude"]
+        dumpFile: ../../../../../../../../../tmp/services-dump-file-relative-test.yaml

test/Resources-ts/Autowire/config/services-dump-file.yaml

@@ -0,0 +1,6 @@
+services:
+    _defaults:
+        autowire: true
+        rootDir: ../src
+        exclude: ["ToExclude"]
+        dumpFile: /tmp/services-dump-file-test.yaml

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

@@ -822,6 +822,58 @@ describe('AutowireTS - Bind', () => {
         assert.strictEqual(container.binds.get('someParam'), 'someValue')
     })
 })
+
+describe('AutowireTS - dumpFile', () => {
+    const resourcesTsFolder = 'Resources-ts'
+    const autowireFolder = 'Autowire'
+    const dir = path.join(__dirname, '..', '..', resourcesTsFolder, autowireFolder, 'src')
+    const dumpFilePath = '/tmp/services-dump-file-test.yaml'
+
+    it('should generate a dump file when dumpFile is set in YAML _defaults', async () => {
+        // Arrange.
+        const configFile = path.join(
+            __dirname, '..', '..', resourcesTsFolder, autowireFolder, 'config', 'services-dump-file.yaml'
+        )
+        const container = new ContainerBuilder(false, dir)
+        const loader = new YamlFileLoader(container)
+
+        // Act.
+        await loader.load(configFile)
+        await container.compile()
+
+        // Assert: load the dumped file in a new container and verify services work
+        const containerDump = new ContainerBuilder(false, dir)
+        const dumpLoader = new YamlFileLoader(containerDump)
+        await dumpLoader.load(dumpFilePath)
+
+        assert.instanceOf(containerDump.get(FooBar), FooBar)
+        assert.instanceOf(containerDump.get(Foo), Foo)
+        assert.instanceOf(containerDump.get(Bar), Bar)
+    })
+
+    it('should generate a dump file when dumpFile is a relative path in YAML _defaults', async () => {
+        // Arrange.
+        const relativeDumpFilePath = '/tmp/services-dump-file-relative-test.yaml'
+        const configFile = path.join(
+            __dirname, '..', '..', resourcesTsFolder, autowireFolder, 'config', 'services-dump-file-relative.yaml'
+        )
+        const container = new ContainerBuilder(false, dir)
+        const loader = new YamlFileLoader(container)
+
+        // Act.
+        await loader.load(configFile)
+        await container.compile()
+
+        // Assert: load the dumped file in a new container and verify services work
+        const containerDump = new ContainerBuilder(false, dir)
+        const dumpLoader = new YamlFileLoader(containerDump)
+        await dumpLoader.load(relativeDumpFilePath)
+
+        assert.instanceOf(containerDump.get(FooBar), FooBar)
+        assert.instanceOf(containerDump.get(Foo), Foo)
+        assert.instanceOf(containerDump.get(Bar), Bar)
+    })
+})
 import KeyedCheckoutService from '../../Resources-ts/Autowire-Keyed/src/Service/KeyedCheckoutService'
 import KeyedPaymentRouterService from '../../Resources-ts/Autowire-Keyed/src/Service/KeyedPaymentRouterService'
 import StripePaymentService from '../../Resources-ts/Autowire-Keyed/src/Service/StripePaymentService'