Add support for <fest:script/>

ogonkov · Aug 31, 2020 · 661d92a · 661d92a
1 parent ef98a04
commit 661d92a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/get-dependencies.js b/src/get-dependencies.js
@@ -12,7 +12,7 @@ const readFile = util.promisify(fs.readFile);
  * @return {boolean}
  */
 function hasAttributes({item: [attributes]}) {
-    return attributes && NODE_ATTRIBUTES in attributes;
+    return Boolean(attributes?.[NODE_ATTRIBUTES]);
 }
 
 function getSrcAttribute({item: [attributes]}) {
@@ -27,7 +27,8 @@ async function getFileImports(source) {
     const root = await getParser().then((parseString) => parseString(source));
     const nodes = filterNodes(root, [
         'fest:include',
-        'fest:insert'
+        'fest:insert',
+        'fest:script'
     ]);
 
     return new Set(

diff --git a/test/fixtures/include.xml b/test/fixtures/include.xml
@@ -1,3 +1,9 @@
 <fest:template xmlns:fest="http://fest.mail.ru" context_name="json">
     Simple include
+
+    <fest:script>
+        <![CDATA[
+            console.log('Hello, again.');
+        ]]>
+    </fest:script>
 </fest:template>
diff --git a/test/fixtures/nested-dependency.xml b/test/fixtures/nested-dependency.xml
@@ -1,3 +1,4 @@
 <fest:template xmlns:fest="http://fest.mail.ru" context_name="json">
     <fest:include context="json.list" src="./include.xml"/>
+    <fest:script src="./script.js"/>
 </fest:template>
diff --git a/test/fixtures/script.js b/test/fixtures/script.js
@@ -0,0 +1 @@
+console.log('Hello, world');
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -52,7 +52,7 @@ describe('dependencies parse', function() {
                         return done(err);
                     }
 
-                    expect(context.addDependency).toHaveBeenCalledTimes(3);
+                    expect(context.addDependency).toHaveBeenCalledTimes(4);
                     expect(context.addDependency).toHaveBeenCalledWith(
                         expect.stringMatching('nested-dependency.xml')
                     );
@@ -62,6 +62,9 @@ describe('dependencies parse', function() {
                     expect(context.addDependency).toHaveBeenCalledWith(
                         expect.stringMatching('include.xml')
                     );
+                    expect(context.addDependency).toHaveBeenCalledWith(
+                        expect.stringMatching('script.js')
+                    );
 
                     done();
                 }