js2xml handling of nested CDATA sections

nashwaan · Jan 15, 2019 · 28937f1 · 28937f1
1 parent d27442a
commit 28937f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/js2xml.js b/lib/js2xml.js
@@ -108,7 +108,7 @@ function writeComment(comment, options) {
 }
 
 function writeCdata(cdata, options) {
-  return options.ignoreCdata ? '' : '<![CDATA[' + ('cdataFn' in options ? options.cdataFn(cdata, currentElementName, currentElement) : cdata) + ']]>';
+  return options.ignoreCdata ? '' : '<![CDATA[' + ('cdataFn' in options ? options.cdataFn(cdata, currentElementName, currentElement) : cdata.replace(']]>', ']]]]><![CDATA[>')) + ']]>';
 }
 
 function writeDoctype(doctype, options) {

diff --git a/test/js2xml-issues.spec.js b/test/js2xml-issues.spec.js
@@ -433,6 +433,23 @@ describe('Testing js2xml.js:', function () {
       });
     });
 
+    describe('case by Nathan Perry', function() {
+      // see n/a
+      var js = {
+        container: {
+          cdata_section: {
+            _cdata: '<p><![CDATA[aaaa, one <bbbb>cccc</bbbb>]]></p>',
+          },
+        },
+      };
+      var xml =
+      '<container>\n' +
+      '  <cdata_section><![CDATA[<p><![CDATA[aaaa, one <bbbb>cccc</bbbb>]]]]><![CDATA[></p>]]></cdata_section>\n' +
+      '</container>';
+      it ('should handle nested CDATA sections', function() {
+        expect(convert.js2xml(js, {compact: true, spaces: 2, fullTagEmptyElement: false})).toEqual(xml);
+      });
+    });
 
   });