fix(xml2js): Attributes were lost when keepCData property was true #73

tests_xml2js.js

@@ -25,6 +25,7 @@
  '<elementY>hello there</elementY>' +
  '<elementZ><![CDATA[hello again]]></elementZ>' +
  '<elementZA>Test<![CDATA[ hello again]]></elementZA>' +
+ '<elementZB attribute="value"><![CDATA[hello again]]></elementZB>' +
  '</document>';
  var x = new X2JS();
  var js = x.xml2js(xml);
@@ -51,6 +52,11 @@
  assert.ok(js.document.elementZA);
  assert.strictEqual(js.document.elementZA.toString(), 'Test hello again');
  assert.strictEqual(js.document.elementZA.__cdata, ' hello again');
+
+ assert.ok(js.document.elementZB);
+ assert.strictEqual(js.document.elementZB.toString(), 'hello again');
+ assert.strictEqual(js.document.elementZB._attribute, 'value');
+ assert.strictEqual(js.document.elementZB.__cdata, 'hello again');
  });
 
  QUnit.test('XML with namespace prefixes', function (assert) {

x2js.js

@@ -415,7 +415,12 @@
  }
  delete result.__cnt;
 
- if (!config.keepCData && (!result.hasOwnProperty('__text') && result.hasOwnProperty('__cdata'))) {
+ /**
+ * We are checking if we are creating a __cdata property or if we just add the content of cdata inside result.
+ * But, if we have a property inside xml tag (<tag PROPERTY="1"></tag>), and a cdata inside, we can't ignore it.
+ * In this case we are keeping __cdata property.
+ */
+ if (!config.keepCData && (!result.hasOwnProperty('__text') && result.hasOwnProperty('__cdata') && Object.keys(result).length === 1)) {
  return (result.__cdata ? result.__cdata : '');
  }