Pass styles into readNumberingXml

3 files changed, 29 insertions, 11 deletions

diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index e0d4a13..5f0fd05 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -22,7 +22,7 @@ var Files = require("./files").Files;
 
 function read(docxFile, input) {
     input = input || {};
-    
+
     return promises.props({
         contentTypes: readContentTypesFromZipFile(docxFile),
         partPaths: findPartPaths(docxFile),
@@ -30,11 +30,14 @@ function read(docxFile, input) {
         files: new Files(input.path ? path.dirname(input.path) : null)
     }).also(function(result) {
         return {
-            numbering: readNumberingFromZipFile(docxFile, result.partPaths.numbering),
             styles: readStylesFromZipFile(docxFile, result.partPaths.styles)
         };
     }).also(function(result) {
         return {
+            numbering: readNumberingFromZipFile(docxFile, result.partPaths.numbering, result.styles)
+        };
+    }).also(function(result) {
+        return {
             footnotes: readXmlFileWithBody(result.partPaths.footnotes, result, function(bodyReader, xml) {
                 if (xml) {
                     return notesReader.createFootnotesReader(bodyReader)(xml);
@@ -90,11 +93,11 @@ function findPartPaths(docxFile) {
             basePath: "",
             fallbackPath: "word/document.xml"
         });
-        
+
         if (!docxFile.exists(mainDocumentPath)) {
             throw new Error("Could not find main document part. Are you sure this is a valid .docx file?");
         }
-        
+
         return xmlFileReader({
             filename: relationshipsFilename(mainDocumentPath),
             readElement: relationshipsReader.readRelationships,
@@ -109,7 +112,7 @@ function findPartPaths(docxFile) {
                     fallbackPath: "word/" + name + ".xml"
                 });
             }
-        
+
             return {
                 mainDocument: mainDocumentPath,
                 comments: findPartRelatedToMainDocument("comments"),
@@ -128,7 +131,7 @@ function findPartPath(options) {
     var relationshipType = options.relationshipType;
     var basePath = options.basePath;
     var fallbackPath = options.fallbackPath;
-    
+
     var targets = relationships.findTargetsByType(relationshipType);
     var normalisedTargets = targets.map(function(target) {
         return stripPrefix(zipfile.joinPath(basePath, target), "/");
@@ -166,7 +169,7 @@ function readXmlFileWithBody(filename, options, func) {
         readElement: relationshipsReader.readRelationships,
         defaultValue: relationshipsReader.defaultValue
     });
-    
+
     return readRelationshipsFromZipFile(options.docxFile).then(function(relationships) {
         var bodyReader = new createBodyReader({
             relationships: relationships,
@@ -194,10 +197,12 @@ var readContentTypesFromZipFile = xmlFileReader({
     defaultValue: contentTypesReader.defaultContentTypes
 });
 
-function readNumberingFromZipFile(zipFile, path) {
+function readNumberingFromZipFile(zipFile, path, styles) {
     return xmlFileReader({
         filename: path,
-        readElement: numberingXml.readNumberingXml,
+        readElement: function(element) {
+            return numberingXml.readNumberingXml(element, {styles: styles});
+        },
         defaultValue: numberingXml.defaultNumbering
     })(zipFile);
 }
diff --git a/lib/docx/numbering-xml.js b/lib/docx/numbering-xml.js
index 24fb7e4..028bf01 100644
--- a/lib/docx/numbering-xml.js
+++ b/lib/docx/numbering-xml.js
@@ -15,7 +15,11 @@ function Numbering(nums, abstractNums) {
     };
 }
 
-function readNumberingXml(root) {
+function readNumberingXml(root, options) {
+    if (!options || !options.styles) {
+        throw new Error("styles is missing");
+    }
+
     var abstractNums = readAbstractNums(root);
     var nums = readNums(root, abstractNums);
     return new Numbering(nums, abstractNums);
diff --git a/test/docx/numbering-xml.tests.js b/test/docx/numbering-xml.tests.js
index 7ecacc2..a9f825a 100644
--- a/test/docx/numbering-xml.tests.js
+++ b/test/docx/numbering-xml.tests.js
@@ -1,6 +1,8 @@
+var assert = require("assert");
 var duck = require("duck");
 
 var readNumberingXml = require("../../lib/docx/numbering-xml").readNumberingXml;
+var stylesReader = require("../../lib/docx/styles-reader");
 var XmlElement = require("../../lib/xml").Element;
 var test = require("../test")(module);
 
@@ -19,7 +21,8 @@ test('w:num element inherits levels from w:abstractNum', function() {
             new XmlElement("w:num", {"w:numId": "47"}, [
                 new XmlElement("w:abstractNumId", {"w:val": "42"})
             ])
-        ])
+        ]),
+        {styles: stylesReader.defaultStyles}
     );
     duck.assertThat(numbering.findLevel("47", "0"), duck.hasProperties({
         isOrdered: false
@@ -28,3 +31,9 @@ test('w:num element inherits levels from w:abstractNum', function() {
         isOrdered: true
     }));
 });
+
+test('when styles is missing then error is thrown', function() {
+    assert.throws(function() {
+        readNumberingXml(new XmlElement("w:numbering", {}, []));
+    }, /styles is missing/);
+});