Fix multiple dependencies parse

ogonkov · Sep 4, 2020 · a822c7d · a822c7d
1 parent f5567d0
commit a822c7d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/filter-nodes.js b/src/filter-nodes.js
@@ -32,10 +32,10 @@ export function filterNodes(
             const {[nodeName]: nextItem} = item;
 
             if (nodeNames.includes(nodeName)) {
-                found.push({
+                found.push(...nextItem.map((item) => ({
                     name: nodeName,
-                    item: nextItem
-                });
+                    item: [item]
+                })));
 
                 continue;
             }

diff --git a/test/fixtures/another-include.xml b/test/fixtures/another-include.xml
@@ -0,0 +1,3 @@
+<fest:template xmlns:fest="http://fest.mail.ru" context_name="json">
+    Simple include 2
+</fest:template>
diff --git a/test/fixtures/nested-dependency.xml b/test/fixtures/nested-dependency.xml
@@ -1,4 +1,5 @@
 <fest:template xmlns:fest="http://fest.mail.ru" context_name="json">
     <fest:include context="json.list" src="./include.xml"/>
+    <fest:include context="json.list" src="./another-include.xml"/>
     <fest:script src="./script.js"/>
 </fest:template>
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -49,7 +49,7 @@ describe('dependencies parse', function() {
 
         await result;
 
-        expect(context.addDependency).toHaveBeenCalledTimes(4);
+        expect(context.addDependency).toHaveBeenCalledTimes(5);
         expect(context.addDependency).toHaveBeenCalledWith(
             expect.stringMatching('nested-dependency.xml')
         );
@@ -59,6 +59,9 @@ describe('dependencies parse', function() {
         expect(context.addDependency).toHaveBeenCalledWith(
             expect.stringMatching('include.xml')
         );
+        expect(context.addDependency).toHaveBeenCalledWith(
+            expect.stringMatching('another-include.xml')
+        );
         expect(context.addDependency).toHaveBeenCalledWith(
             expect.stringMatching('script.js')
         );