Merge branch 'master' into updated-oneListGroup-plus-attributes

Author: a-rasin

spec/j2x_spec.js

@@ -483,6 +483,19 @@ describe("XMLBuilder", function() {
         expect(result).toEqual(expected);
     });
 
+    it("should correctly handle values with oneListGroup", function() {
+        const jObj = {
+            "a": [
+                "(first)",
+                "(second)"
+            ],
+        };
+        const builder = new XMLBuilder({oneListGroup:"true", attributesGroupName: "@"});
+        const result = builder.build(jObj);
+        const expected = `<a>(first)(second)</a>`;
+        expect(result).toEqual(expected);
+    });
+
     it("should handle attributes with oneListGroup", function() {
         const jObj = {
             "a": [
@@ -506,7 +519,7 @@ describe("XMLBuilder", function() {
         const expected = `<a foo="bar" baz="foo" bar="baz"><b>1</b><b>2</b></a>`;
         expect(result).toEqual(expected);
     });
-    
+
     it('should build tag with only text node', async () => {
         const schema_obj = {
           field: {

src/xmlbuilder/json2xml.js

@@ -135,7 +135,13 @@ Builder.prototype.j2x = function(jObj, level) {
             listTagVal += this.processTextOrObjNode(item, key, level)
           }
         } else {
-          listTagVal += this.buildTextValNode(item, key, '', level);
+          if (this.options.oneListGroup) {
+            let textValue = this.options.tagValueProcessor(key, item);
+            textValue = this.replaceEntitiesValue(textValue);
+            listTagVal += textValue;
+          } else {
+            listTagVal += this.buildTextValNode(item, key, '', level);
+          }
         }
       }
       if(this.options.oneListGroup){