chore(write): split up generic parsing into ns + containments

Author: nikku

lib/write.js

@@ -311,7 +311,7 @@ ElementSerializer.prototype.build = function(element) {
   var isGeneric = elementDescriptor.isGeneric;
 
   if (isGeneric) {
-    otherAttrs = this.parseGeneric(element);
+    otherAttrs = this.parseGenericNsAttributes(element);
   } else {
     otherAttrs = this.parseNsAttributes(element);
   }
@@ -325,7 +325,9 @@ ElementSerializer.prototype.build = function(element) {
   // compute tag name
   this.tagName = this.addTagName(this.ns);
 
-  if (!isGeneric) {
+  if (isGeneric) {
+    this.parseGenericContainments(element);
+  } else {
     properties = getSerializableProperties(element);
 
     this.parseAttributes(filterAttributes(properties));
@@ -388,35 +390,29 @@ ElementSerializer.prototype.nsAttributeName = function(element) {
   }
 };
 
-ElementSerializer.prototype.parseGeneric = function(element) {
+ElementSerializer.prototype.parseGenericNsAttributes = function(element) {
 
-  var self = this,
-      body = this.body;
-
-  var attributes = [];
-
-  forEach(element, function(val, key) {
+  return Object.entries(element).filter(
+    ([ key, value ]) => !key.startsWith('$') && this.parseNsAttribute(element, key, value)
+  ).map(
+    ([ key, value ]) => ({ name: key, value: value })
+  );
+};
 
-    var nonNsAttr;
+ElementSerializer.prototype.parseGenericContainments = function(element) {
+  var body = element.$body;
 
-    if (key === '$body') {
-      body.push(new BodySerializer().build({ type: 'String' }, val));
-    } else
-    if (key === '$children') {
-      forEach(val, function(child) {
-        body.push(new ElementSerializer(self).build(child));
-      });
-    } else
-    if (key.indexOf('$') !== 0) {
-      nonNsAttr = self.parseNsAttribute(element, key, val);
+  if (body) {
+    this.body.push(new BodySerializer().build({ type: 'String' }, body));
+  }
 
-      if (nonNsAttr) {
-        attributes.push({ name: key, value: val });
-      }
-    }
-  });
+  var children = element.$children;
 
-  return attributes;
+  if (children) {
+    forEach(children, child => {
+      this.body.push(new ElementSerializer(this).build(child));
+    });
+  }
 };
 
 ElementSerializer.prototype.parseNsAttribute = function(element, name, value) {