extract xml formatting

Author: dodo

lib/xml.js

@@ -9,10 +9,10 @@ function xml (input, indent) {
 
     if (input && input.forEach) {
         input.forEach(function(value){
-            output.push(resolve(value, indent, indent ? 1 : 0));
+            output.push(format(resolve(value, indent, indent ? 1 : 0)));
         });
     } else {
-        output.push(resolve(input, indent, indent ? 1 : 0));
+        output.push(format(resolve(input, indent, indent ? 1 : 0)));
     }
     return output.join(indent ? '\n' : '');
 }
@@ -81,16 +81,37 @@ function resolve(data, indent, indent_count) {
 
     }
 
-    return indent_spaces
-        + (name ? '<' + name : '')
-        + (attributes.length ? ' '
-                + attributes.join(' ')
-                : '')
-        + (content.length ? (name ? '>' : '')
-                + content.join(indent ? '\n' : '')
-                + (content.length > 1 ? indent_spaces : '')
-                + (name ? '</' + name + '>' : '')
-            : (name ? '/>' : ''));
+    return { name:  name,
+        attributes: attributes,
+        content:    content,
+        indents:    indent_spaces,
+        indent:     indent };
+}
+
+function format(elem) {
+    if (typeof elem != 'object')
+        return elem;
+
+    var len = elem.content.length;
+    var output = elem.indents
+        + (elem.name ? '<' + elem.name : '')
+        + (elem.attributes.length ? ' ' + elem.attributes.join(' ') : '')
+        + (len ? (elem.name ? '>' : '') : (elem.name ? '/>' : ''));
+
+    if (!len)
+        return output;
+
+    var first = true;
+    while (elem.content.length) {
+        var value = elem.content.shift();
+        if (value === undefined)
+            continue;
+        output += (elem.indent && !first ? '\n' : '') + format(value);
+        first = false;
+    }
+
+    return output + (len > 1 ? elem.indents : '')
+        + (elem.name ? '</' + elem.name + '>' : '');
 }
 
 function attribute(key, value) {