rename toXml -> prepForXml

ts/docx/xml-components/base.ts

@@ -5,5 +5,5 @@ export abstract class BaseXmlComponent {
         this.rootKey = rootKey;
     }
 
-    public abstract toXml(): object;
+    public abstract prepForXml(): object;
 }

ts/docx/xml-components/default-attributes.ts

@@ -16,7 +16,7 @@ export abstract class XmlAttributeComponent extends BaseXmlComponent {
         }
     }
 
-    public toXml(): object {
+    public prepForXml(): object {
         const attrs = {};
         if (this.root !== undefined) {
             _.forOwn(this.root, (value, key) => {
@@ -26,8 +26,6 @@ export abstract class XmlAttributeComponent extends BaseXmlComponent {
                 }
             });
         }
-        const ret = {};
+        return {[this.rootKey]: attrs};
-        ret[this.rootKey] = attrs;
-        return ret;
     }
 }

ts/docx/xml-components/index.ts

@@ -10,16 +10,15 @@ export abstract class XmlComponent extends BaseXmlComponent {
         this.root = new Array<BaseXmlComponent>();
     }
 
-    public toXml(): object {
+    public prepForXml(): object {
-        // What does 'ret' stand for? Retain? Return?
+        const children = this.root.map((comp) => {
-        const ret = this.root.map((comp) => {
             if (comp instanceof BaseXmlComponent) {
-                return comp.toXml();
+                return comp.prepForXml();
             }
             return comp;
         }).filter((comp) => comp); // Exclude null, undefined, and empty strings
         return {
-            [this.rootKey]: ret,
+            [this.rootKey]: children,
         };
     }
 }

ts/export/formatter.ts

@@ -2,6 +2,6 @@ import { BaseXmlComponent } from "../docx/xml-components";
 
 export class Formatter {
     public format(input: BaseXmlComponent): any {
-        return input.toXml();
+        return input.prepForXml();
     }
 }