From 9ff57bb770e0296bb2f5b7a41711c53954eb8c4e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 16 Aug 2015 14:21:25 +0100 Subject: Split xmlreader into nodes and reader modules --- lib/docx/office-xml-reader.js | 4 +- lib/xml/index.js | 2 + lib/xml/nodes.js | 60 ++++++++++++++++++ lib/xml/reader.js | 87 ++++++++++++++++++++++++++ lib/xmlreader.js | 141 ------------------------------------------ 5 files changed, 151 insertions(+), 143 deletions(-) create mode 100644 lib/xml/index.js create mode 100644 lib/xml/nodes.js create mode 100644 lib/xml/reader.js delete mode 100644 lib/xmlreader.js (limited to 'lib') diff --git a/lib/docx/office-xml-reader.js b/lib/docx/office-xml-reader.js index 71f5b57..b5231eb 100644 --- a/lib/docx/office-xml-reader.js +++ b/lib/docx/office-xml-reader.js @@ -1,5 +1,5 @@ var promises = require("../promises"); -var xmlreader = require("../xmlreader"); +var xml = require("../xml"); exports.readXmlFromZipFile = readXmlFromZipFile; @@ -17,7 +17,7 @@ var xmlNamespaceMap = { function read(xmlString) { - return xmlreader.read(xmlString, xmlNamespaceMap); + return xml.readString(xmlString, xmlNamespaceMap); } diff --git a/lib/xml/index.js b/lib/xml/index.js new file mode 100644 index 0000000..6c35998 --- /dev/null +++ b/lib/xml/index.js @@ -0,0 +1,2 @@ +exports.Element = require("./nodes").Element; +exports.readString = require("./reader").readString; diff --git a/lib/xml/nodes.js b/lib/xml/nodes.js new file mode 100644 index 0000000..ed273cf --- /dev/null +++ b/lib/xml/nodes.js @@ -0,0 +1,60 @@ +var _ = require("underscore"); + + +exports.Element = Element; + + +var emptyElement = { + first: function() { + return null; + }, + firstOrEmpty: function() { + return emptyElement; + }, + attributes: {} +}; + +function Element(name, attributes, children) { + this.type = "element"; + this.name = name; + this.attributes = attributes || {}; + this.children = children || []; +} + +Element.prototype.first = function(name) { + return _.find(this.children, function(child) { + return child.name == name; + }); +}; + +Element.prototype.firstOrEmpty = function(name) { + return this.first(name) || emptyElement; +}; + +Element.prototype.getElementsByTagName = function(name) { + var elements = _.filter(this.children, function(child) { + return child.name == name; + }); + return toElementList(elements); +}; + +Element.prototype.text = function() { + if (this.children.length === 0) { + return ""; + } else if (this.children.length !== 1 || this.children[0].type !== "text") { + throw new Error("Not implemented"); + } + return this.children[0].value; +}; + +var elementListPrototype = { + getElementsByTagName: function(name) { + return toElementList(_.flatten(this.map(function(element) { + return element.getElementsByTagName(name); + }, true))); + } +}; + +function toElementList(array) { + return _.extend(array, elementListPrototype); +} diff --git a/lib/xml/reader.js b/lib/xml/reader.js new file mode 100644 index 0000000..ab175f2 --- /dev/null +++ b/lib/xml/reader.js @@ -0,0 +1,87 @@ +var promises = require("../promises"); +var sax = require("sax"); +var _ = require("underscore"); + +var Element = require("./nodes").Element; + +exports.readString = readString; + +function readString(xmlString, namespaceMap) { + namespaceMap = namespaceMap || {}; + + var finished = false; + var parser = sax.parser(true, {xmlns: true, position: false}); + + var rootElement = {children: []}; + var currentElement = rootElement; + var stack = []; + + var deferred = promises.defer(); + + parser.onopentag = function(node) { + var attributes = mapObject(node.attributes, function(attribute) { + return attribute.value; + }, mapName); + + var element = new Element(mapName(node), attributes); + currentElement.children.push(element); + stack.push(currentElement); + currentElement = element; + }; + + function mapName(node) { + if (node.uri) { + var mappedPrefix = namespaceMap[node.uri]; + var prefix; + if (mappedPrefix) { + prefix = mappedPrefix; + } else { + prefix = "{" + node.uri + "}"; + } + return prefix + ":" + node.local; + } else { + return node.local; + } + } + + parser.onclosetag = function(node) { + currentElement = stack.pop(); + }; + + parser.ontext = function(text) { + if (currentElement !== rootElement) { + currentElement.children.push({ + type: "text", + value: text + }); + } + }; + + parser.onend = function() { + if (!finished) { + finished = true; + deferred.resolve({ + root: rootElement.children[0] + }); + } + }; + + parser.onerror = function(error) { + if (!finished) { + finished = true; + deferred.reject(error); + } + }; + + parser.write(xmlString).close(); + + return deferred.promise; +} + +function mapObject(input, valueFunc, keyFunc) { + return _.reduce(input, function(result, value, key) { + var mappedKey = keyFunc.call(null, value, key, input); + result[mappedKey] = valueFunc.call(null, value, key, input); + return result; + }, {}); +} diff --git a/lib/xmlreader.js b/lib/xmlreader.js deleted file mode 100644 index 551366f..0000000 --- a/lib/xmlreader.js +++ /dev/null @@ -1,141 +0,0 @@ -var promises = require("./promises"); -var sax = require("sax"); -var _ = require("underscore"); - -exports.read = read; -exports.Element = Element; - -function read(xmlString, namespaceMap) { - namespaceMap = namespaceMap || {}; - - var finished = false; - var parser = sax.parser(true, {xmlns: true, position: false}); - - var rootElement = {children: []}; - var currentElement = rootElement; - var stack = []; - - var deferred = promises.defer(); - - parser.onopentag = function(node) { - var attributes = mapObject(node.attributes, function(attribute) { - return attribute.value; - }, mapName); - - var element = new Element(mapName(node), attributes); - currentElement.children.push(element); - stack.push(currentElement); - currentElement = element; - }; - - function mapName(node) { - if (node.uri) { - var mappedPrefix = namespaceMap[node.uri]; - var prefix; - if (mappedPrefix) { - prefix = mappedPrefix; - } else { - prefix = "{" + node.uri + "}"; - } - return prefix + ":" + node.local; - } else { - return node.local; - } - } - - parser.onclosetag = function(node) { - currentElement = stack.pop(); - }; - - parser.ontext = function(text) { - if (currentElement !== rootElement) { - currentElement.children.push({ - type: "text", - value: text - }); - } - }; - - parser.onend = function() { - if (!finished) { - finished = true; - deferred.resolve({ - root: rootElement.children[0] - }); - } - }; - - parser.onerror = function(error) { - if (!finished) { - finished = true; - deferred.reject(error); - } - }; - - parser.write(xmlString).close(); - - return deferred.promise; -} - -function mapObject(input, valueFunc, keyFunc) { - return _.reduce(input, function(result, value, key) { - var mappedKey = keyFunc.call(null, value, key, input); - result[mappedKey] = valueFunc.call(null, value, key, input); - return result; - }, {}); -} - -var emptyElement = { - first: function() { - return null; - }, - firstOrEmpty: function() { - return emptyElement; - }, - attributes: {} -}; - -function Element(name, attributes, children) { - this.type = "element"; - this.name = name; - this.attributes = attributes || {}; - this.children = children || []; -} - -Element.prototype.first = function(name) { - return _.find(this.children, function(child) { - return child.name == name; - }); -}; - -Element.prototype.firstOrEmpty = function(name) { - return this.first(name) || emptyElement; -}; - -Element.prototype.getElementsByTagName = function(name) { - var elements = _.filter(this.children, function(child) { - return child.name == name; - }); - return toElementList(elements); -}; - -Element.prototype.text = function() { - if (this.children.length === 0) { - return ""; - } else if (this.children.length !== 1 || this.children[0].type !== "text") { - throw new Error("Not implemented"); - } - return this.children[0].value; -}; - -var elementListPrototype = { - getElementsByTagName: function(name) { - return toElementList(_.flatten(this.map(function(element) { - return element.getElementsByTagName(name); - }, true))); - } -}; - -function toElementList(array) { - return _.extend(array, elementListPrototype); -} -- cgit v1.2.3