j2x: suppress empty nodes to self closing node if configured

Author: amitguptagwl

spec/j2x_spec.js

@@ -235,6 +235,42 @@ describe("XMLParser", function () {
         expect(result).toEqual(expected);
       });
 
+      it("should supress empty node to self closing node when parsing to XML", function () {
+        var jObj = {
+            a : {
+                "@": {
+                    b : "val>1",
+                    c : "val<2"
+                },
+                "#text": "text\\cvalue>\\c",
+                tag: {
+                    k: 34,
+                    g: "",
+                    nested: {
+                        "@": {
+                            b : "val>1",
+                            c : "val<2"
+                        }
+                    }
+                },
+                "__cdata": [
+                    "this text is > from CDATA",
+                    ""
+                ]
+            }
+        };
+        var parser = new Parser({
+            cdataTagName : "__cdata",
+            attrNodeName : "@",
+            encodeHTMLchar: true,
+            supressEmptyNode: true
+        });
+        var result = parser.parse(jObj);
+        //console.log(result);
+        var expected = '<a b="val&gt;1" c="val&lt;2"><tag><k>34</k><g/><nested b="val&gt;1" c="val&lt;2"/></tag>text<![CDATA[this text is > from CDATA]]>value&gt;<![CDATA[]]></a>';
+        expect(result).toEqual(expected);
+      });
+
 
     /*   it("should format when parsing to XML", function () {
         var jObj = {

src/j2x.js

@@ -10,7 +10,8 @@ var defaultOptions = {
     cdataTagName: false,
     cdataPositionChar: "\\c",
     format: false,
-    indentBy: "  "
+    indentBy: "  ",
+    supressEmptyNode: false
 };
 
 function Parser(options){
@@ -44,6 +45,17 @@ function Parser(options){
         this.newLine = "";
     }
 
+    if(this.options.supressEmptyNode){
+        this.buildTextNode = buildEmptyTextNode;
+        this.buildObjNode = buildEmptyObjNode;
+    }else{
+        this.buildTextNode = buildTextValNode;
+        this.buildObjNode = buildObjectNode;
+    }
+
+    this.buildTextValNode = buildTextValNode;
+    this.buildObjectNode = buildObjectNode;
+
 }
 
 
@@ -75,7 +87,7 @@ Parser.prototype.j2x = function(jObj,level){
                         val += this.encodeHTMLchar(jObj[key]);    
                     }
                 }else{
-                    val += this.indentate(level) + "<" + key + ">" +this.encodeHTMLchar(jObj[key])+"</"+key+ this.tagEndChar;
+                    val += this.buildTextNode(jObj[key],key,"",level);
                 }
             }
         }else if(Array.isArray(jObj[key])){//repeated nodes
@@ -94,15 +106,10 @@ Parser.prototype.j2x = function(jObj,level){
                     var item = jObj[key][j];
                     if(typeof item === "object"){
                         var result = this.j2x(item,level+1);
-                        val += this.indentate(level) 
-                                    + "<"+key + result.attrStr 
-                                    + this.tagEndChar 
-                                    + result.val 
-                                    + this.newLine
-                                    + this.indentate(level)
-                                    + "</"+key+this.tagEndChar;
+                        val  += this.buildObjNode(result.val,key,result.attrStr,level);
                     }else{
-                        val += this.indentate(level) + "<"+key+">"+  this.encodeHTMLchar(item) + "</"+key+this.tagEndChar;
+                        val += this.buildTextNode(item,key,"",level);
+                        //val += this.indentate(level) + "<"+key+">"+  this.encodeHTMLchar(item) + "</"+key+this.tagEndChar;
                     }
                 }
             }
@@ -116,13 +123,7 @@ Parser.prototype.j2x = function(jObj,level){
                 }
             }else{
                 var result = this.j2x(jObj[key],level+1);
-                val  += this.indentate(level) 
-                            + "<" + key + result.attrStr 
-                            + this.tagEndChar 
-                            + result.val 
-                            + this.newLine
-                            + this.indentate(level)
-                            + "</"+key+this.tagEndChar;
+                val  += this.buildObjNode(result.val,key,result.attrStr,level);
             }
         }
     }
@@ -150,6 +151,40 @@ function replaceCDATAarr(str,cdata){
     }
 }
 
+function buildObjectNode(val,key,attrStr,level){
+    return this.indentate(level) 
+                + "<" + key + attrStr 
+                + this.tagEndChar 
+                + val 
+                + this.newLine
+                + this.indentate(level)
+                + "</"+key+this.tagEndChar;
+}
+
+function buildEmptyObjNode(val,key,attrStr,level){
+    if(val !== "" ){
+        return this.buildObjectNode(val,key,attrStr,level);
+    }else{
+        return this.indentate(level) 
+                + "<" + key + attrStr 
+                + "/"
+                + this.tagEndChar 
+                //+ this.newLine
+    }
+}
+
+function buildTextValNode(val,key,attrStr,level){
+    return this.indentate(level) + "<" + key + attrStr +  ">" +this.encodeHTMLchar(val)+"</"+key+ this.tagEndChar;
+}
+
+function buildEmptyTextNode(val,key,attrStr,level){
+    if(val !== ""){
+        return this.buildTextValNode(val,key,attrStr,level);
+    }else{
+        return this.indentate(level) + "<" + key + attrStr + "/" + this.tagEndChar;
+    }
+}
+
 function indentate(level){
     return this.options.indentBy.repeat(level);
 }