xml-toolkit 1.0.40 → 1.0.42

package/index.js

@@ -1,22 +1,20 @@
-for (const name of [
-
-	'XMLLexer',
-	'XMLReader',
-	'SAXEvent',
-	'AttributesMap',
-	'MoxyLikeJsonEncoder',
-	'XMLNode',
-	'XMLSchemata',
-	'SOAP11',
-	'SOAP12',
-	'EntityResolver',
-	'XMLIterator',
-	'XMLParser',
-	'SOAPFault',
-	'SOAPEncoding',
-	'XMLPrinter',
-
-]) module.exports [name] = require ('./lib/' + name)
+module.exports = {
+	AttributesMap:       require ('./lib/AttributesMap'),	
+	EntityResolver:      require ('./lib/EntityResolver'),	
+	MoxyLikeJsonEncoder: require ('./lib/MoxyLikeJsonEncoder'),
+	SOAP11:              require ('./lib/SOAP11'),
+	SOAP12:              require ('./lib/SOAP12'),
+	SOAPEncoding:        require ('./lib/SOAPEncoding'),
+	SOAPFault:           require ('./lib/SOAPFault'),
+	SAXEvent:            require ('./lib/SAXEvent'),
+	XMLIterator:         require ('./lib/XMLIterator'),
+	XMLNode:             require ('./lib/XMLNode'),
+	XMLLexer:            require ('./lib/XMLLexer'),
+	XMLParser:           require ('./lib/XMLParser'),
+	XMLPrinter:          require ('./lib/XMLPrinter'),
+	XMLReader:           require ('./lib/XMLReader'),
+	XMLSchemata:         require ('./lib/XMLSchemata'),
+}
 
 module.exports.SOAP = v => {switch (String (v)) {
 

package/lib/NamespacesMap.js

@@ -24,6 +24,8 @@ const NamespacesMap = class extends Map {
 
 			super (parent.namespacesMap)
 
+			this.delete ('')
+
 		}
 
 	}

package/lib/XMLPrinter.js

@@ -77,6 +77,8 @@ const XMLPrinter = class {
 
 		}
 
+		this.decl = o.decl
+
 		this.reset ()
 
 	}
@@ -87,31 +89,36 @@ const XMLPrinter = class {
 		this.stack = []
 		this.isOpening = false
 
+		const {decl} = this; if (decl) this.writeXMLDecl (decl)
+
+		return this
+
 	}
 
 	newLine (delta = 0) {
 
-		return this.EOL + this.space.repeat (this.level + this.stack.length + delta)
+		this.text += `${this.EOL}${this.space.repeat (this.level + this.stack.length + delta)}`
 
 	}
 
-	append (s) {
+	get lastCharCode () {
 
-		this.text += s
+		const {text} = this
 
-		this.lastCharCode = s.charCodeAt (s.length - 1)
+		return text.charCodeAt (text.length - 1)
 
 	}
 
 	openElement (name) {
 
 		if (this.stack.length !== 0) {
-			if (this.attrSpace && this.lastCharCode === CH_QQ) this.append (this.newLine (-1))
-			if (this.isOpening) this.append (`>`)
-			if (this.space)     this.append (this.newLine ())
+			if (this.attrSpace && this.lastCharCode === CH_QQ) this.newLine (-1)
+			if (this.isOpening) this.text += `>`
 		}
 
-		this.append (`<${name}`)
+		if (this.space && this.text) this.newLine ()
+
+		this.text += `<${name}`
 		this.stack.push (name)
 
 		this.isOpening = true
@@ -128,7 +135,20 @@ const XMLPrinter = class {
 
 		if (typeof value !== 'string') throw Error ('The attribute value must be a string, not ' + (typeof value))
 
-		this.append (`${this.attrSpace ? `${this.newLine (-1)}${this.attrSpace}` : ' '}${name}="${this.ESC_ATTR.escape (value)}"`)
+		if (this.attrSpace) {
+
+			this.newLine (-1)
+
+			this.text += this.attrSpace
+
+		}
+		else {
+
+			this.text += ' '
+
+		}
+
+		this.text += `${name}="${this.ESC_ATTR.escape (value)}"`
 
 		return this
 
@@ -143,12 +163,12 @@ const XMLPrinter = class {
 		if (value.length === 0) return this
 
 		if (this.isOpening) {
-			if (this.attrSpace && this.lastCharCode === CH_QQ) this.append (this.newLine (-1))
-			this.append (`>`)
+			if (this.attrSpace && this.lastCharCode === CH_QQ) this.newLine (-1)
+			this.text += `>`
 			this.isOpening = false
 		}
 
-		this.append (this.ESC_BODY.escape (value))
+		this.text += this.ESC_BODY.escape (value)
 
 		return this
 
@@ -159,13 +179,13 @@ const XMLPrinter = class {
 		const name = this.stack.pop ()
 
 		if (this.isOpening) {
-			if (this.attrSpace && this.lastCharCode === CH_QQ) this.append (this.newLine ())
-			this.append (` />`)
+			if (this.attrSpace && this.lastCharCode === CH_QQ) this.newLine ()
+			this.text += ` />`
 			this.isOpening = false
 		}
 		else {
-			if (this.space && this.lastCharCode === CH_GT) this.append (this.newLine ())
-			this.append (`</${name}>`)
+			if (this.space && this.lastCharCode === CH_GT) this.newLine ()
+			this.text += `</${name}>`
 		}
 
 		return this
@@ -178,6 +198,59 @@ const XMLPrinter = class {
 
 		this.openElement (node.name)
 
+		const {namespacesMap} = node; if (namespacesMap != null && namespacesMap.has ('')) this.writeAttribute ('xmlns', namespacesMap.get (''))
+
+		if (this.stack.length === 1) {
+
+			if (namespacesMap != null) {
+
+				let min = Infinity; for (const name of namespacesMap.keys ()) {
+
+					const {length} = name
+
+					if (min > length) min = length
+
+				}
+
+				min += 2
+
+				const prefixes = new Set ()
+
+				const checkName = name => {
+
+					if (name.length < min) return
+
+					const pos = name.indexOf (':'); if (pos === -1) return
+
+					const prefix = name.substring (0, pos); if (!namespacesMap.has (prefix)) return
+
+					prefixes.add (prefix)
+
+				}
+
+				const checkNames = n => {
+
+					checkName (n.name)
+
+					for (const [name, value] of n.attributes.entries ()) {
+						checkName (name)
+						checkName (value)
+					}
+
+					for (const child of n.children) if (child.type === SAXEvent.TYPES.END_ELEMENT) checkNames (child); else checkName (child.src)
+
+				}
+
+				checkNames (node)
+
+				for (const prefix of prefixes.values ())
+
+					this.writeAttribute ('xmlns:' + prefix, namespacesMap.get (prefix))
+
+			}						
+
+		}
+
 		for (const [name, value] of node.attributes.entries ()) this.writeAttribute (name, value)
 
 		for (const child of node.children) this.writeNode (child)
@@ -188,23 +261,17 @@ const XMLPrinter = class {
 
 	}
 
-	writeXMLDecl (encoding, standalone) {
+	writeXMLDecl ({encoding, standalone} = {}) {
 
 		if (this.stack.length !== 0) throw Error ('The document is already started')
 
-		this.append ('<?xml version="1.0"')
+		this.text += '<?xml version="1.0"'
 
-		if (encoding != null) this.append (` encoding="${encoding}"`)
+		if (encoding != null) this.text += ` encoding="${encoding}"`
 		
-		if (standalone != null) {
-
-			if (standalone !== 'yes' && standalone !== 'no') throw Error ('Invalid `standalone`: ' + standalone)
-
-			this.append (` standalone="${standalone}"`)
-
-		}
+		if (standalone != null) this.text += ` standalone="${standalone ? 'yes' : 'no'}"`
 
-		this.append ('?>')
+		this.text += '?>'
 
 		return this
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [