Return root element directly when reading XML

10 files changed, 23 insertions, 28 deletions

diff --git a/lib/docx/comments-reader.js b/lib/docx/comments-reader.js
index 41bf8f6..725fdb4 100644
--- a/lib/docx/comments-reader.js
+++ b/lib/docx/comments-reader.js
@@ -2,8 +2,8 @@ var documents = require("../documents");
 var Result = require("../results").Result;
 
 function createCommentsReader(bodyReader) {
-    function readCommentsXml(xml) {
-        return Result.combine(xml.root.getElementsByTagName("w:comment")
+    function readCommentsXml(element) {
+        return Result.combine(element.getElementsByTagName("w:comment")
             .map(readCommentElement));
     }
 
diff --git a/lib/docx/content-types-reader.js b/lib/docx/content-types-reader.js
index 5364b87..8233119 100644
--- a/lib/docx/content-types-reader.js
+++ b/lib/docx/content-types-reader.js
@@ -13,11 +13,11 @@ var fallbackContentTypes = {
 exports.defaultContentTypes = contentTypes({}, {});
 
 
-function readContentTypesFromXml(xml) {
+function readContentTypesFromXml(element) {
     var extensionDefaults = {};
     var overrides = {};
     
-    xml.root.children.forEach(function(child) {
+    element.children.forEach(function(child) {
         if (child.name === "content-types:Default") {
             extensionDefaults[child.attributes.Extension] = child.attributes.ContentType;
         }
diff --git a/lib/docx/document-xml-reader.js b/lib/docx/document-xml-reader.js
index c241c70..12ca19e 100644
--- a/lib/docx/document-xml-reader.js
+++ b/lib/docx/document-xml-reader.js
@@ -7,8 +7,8 @@ var Result = require("../results").Result;
 function DocumentXmlReader(options) {
     var bodyReader = options.bodyReader;
     
-    function convertXmlToDocument(documentXml) {
-        var body = documentXml.root.first("w:body");
+    function convertXmlToDocument(element) {
+        var body = element.first("w:body");
         
         var result = bodyReader.readXmlElements(body.children)
             .map(function(children) {
diff --git a/lib/docx/notes-reader.js b/lib/docx/notes-reader.js
index a74f79b..98edfdc 100644
--- a/lib/docx/notes-reader.js
+++ b/lib/docx/notes-reader.js
@@ -5,8 +5,8 @@ exports.createFootnotesReader = createReader.bind(this, "footnote");
 exports.createEndnotesReader = createReader.bind(this, "endnote");
 
 function createReader(noteType, bodyReader) {
-    function readNotesXml(xml) {
-        return Result.combine(xml.root.getElementsByTagName("w:" + noteType)
+    function readNotesXml(element) {
+        return Result.combine(element.getElementsByTagName("w:" + noteType)
             .filter(isFootnoteElement)
             .map(readFootnoteElement));
     }
diff --git a/lib/docx/numbering-xml.js b/lib/docx/numbering-xml.js
index 7a3f4ce..2cfd9e1 100644
--- a/lib/docx/numbering-xml.js
+++ b/lib/docx/numbering-xml.js
@@ -15,15 +15,15 @@ function Numbering(nums) {
     };
 }
 
-function readNumberingXml(xml) {
-    var abstractNums = readAbstractNums(xml);
-    var nums = readNums(xml, abstractNums);
+function readNumberingXml(root) {
+    var abstractNums = readAbstractNums(root);
+    var nums = readNums(root, abstractNums);
     return new Numbering(nums);
 }
 
-function readAbstractNums(xml) {
+function readAbstractNums(root) {
     var abstractNums = {};
-    xml.root.getElementsByTagName("w:abstractNum").forEach(function(element) {
+    root.getElementsByTagName("w:abstractNum").forEach(function(element) {
         var id = element.attributes["w:abstractNumId"];
         abstractNums[id] = readAbstractNum(element);
     });
@@ -43,9 +43,9 @@ function readAbstractNum(element) {
     return levels;
 }
 
-function readNums(xml, abstractNums) {
+function readNums(root, abstractNums) {
     var nums = {};
-    xml.root.getElementsByTagName("w:num").forEach(function(element) {
+    root.getElementsByTagName("w:num").forEach(function(element) {
         var id = element.attributes["w:numId"];
         var abstractNumId = element.first("w:abstractNumId").attributes["w:val"];
         nums[id] = abstractNums[abstractNumId];
diff --git a/lib/docx/office-xml-reader.js b/lib/docx/office-xml-reader.js
index f9e0b8b..a8d4c47 100644
--- a/lib/docx/office-xml-reader.js
+++ b/lib/docx/office-xml-reader.js
@@ -23,8 +23,7 @@ var xmlNamespaceMap = {
 function read(xmlString) {
     return xml.readString(xmlString, xmlNamespaceMap)
         .then(function(document) {
-            document.root = collapseAlternateContent(document.root)[0];
-            return document;
+            return collapseAlternateContent(document)[0];
         });
 }
 
diff --git a/lib/docx/relationships-reader.js b/lib/docx/relationships-reader.js
index 7747bda..93fc618 100644
--- a/lib/docx/relationships-reader.js
+++ b/lib/docx/relationships-reader.js
@@ -1,9 +1,9 @@
 exports.readRelationships = readRelationships;
 
 
-function readRelationships(relationshipsXml) {
+function readRelationships(element) {
     var relationships = {};
-    relationshipsXml.root.children.forEach(function(child) {
+    element.children.forEach(function(child) {
         if (child.name === "{http://schemas.openxmlformats.org/package/2006/relationships}Relationship") {
             relationships[child.attributes.Id] = {
                 target: child.attributes.Target
diff --git a/lib/docx/style-map.js b/lib/docx/style-map.js
index 70c0b83..9fe26bb 100644
--- a/lib/docx/style-map.js
+++ b/lib/docx/style-map.js
@@ -24,8 +24,7 @@ function updateRelationships(docxFile) {
     var relationshipElementName = "{" + relationshipsUri + "}Relationship";
     return docxFile.read(path, "utf8")
         .then(xml.readString)
-        .then(function(relationshipsDocument) {
-            var relationshipsContainer = relationshipsDocument.root;
+        .then(function(relationshipsContainer) {
             var relationships = relationshipsContainer.children;
             addOrUpdateElement(relationships, relationshipElementName, "Id", {
                 "Id": "rMammothStyleMap",
@@ -44,8 +43,7 @@ function updateContentTypes(docxFile) {
     var overrideName = "{" + contentTypesUri + "}Override";
     return docxFile.read(path, "utf8")
         .then(xml.readString)
-        .then(function(typesDocument) {
-            var typesElement = typesDocument.root;
+        .then(function(typesElement) {
             var children = typesElement.children;
             addOrUpdateElement(children, overrideName, "PartName", {
                 "PartName": styleMapAbsolutePath,
diff --git a/lib/docx/styles-reader.js b/lib/docx/styles-reader.js
index 3419ac4..4462cf0 100644
--- a/lib/docx/styles-reader.js
+++ b/lib/docx/styles-reader.js
@@ -13,7 +13,7 @@ function Styles(paragraphStyles, characterStyles) {
     };
 }
 
-function readStylesXml(xml) {
+function readStylesXml(root) {
     var paragraphStyles = {};
     var characterStyles = {};
     
@@ -22,7 +22,7 @@ function readStylesXml(xml) {
         "character": characterStyles
     };
     
-    xml.root.getElementsByTagName("w:style").forEach(function(styleElement) {
+    root.getElementsByTagName("w:style").forEach(function(styleElement) {
         var style = readStyleElement(styleElement);
         var styleSet = styles[style.type];
         if (styleSet) {
diff --git a/lib/xml/reader.js b/lib/xml/reader.js
index 844ee0c..0c2e7f5 100644
--- a/lib/xml/reader.js
+++ b/lib/xml/reader.js
@@ -58,9 +58,7 @@ function readString(xmlString, namespaceMap) {
     parser.onend = function() {
         if (!finished) {
             finished = true;
-            deferred.resolve({
-                root: rootElement.children[0]
-            });
+            deferred.resolve(rootElement.children[0]);
         }
     };