xml-toolkit 1.0.9 → 1.0.10

package/lib/NamespacePrefixesMap.js

@@ -2,51 +2,33 @@ const assert = require ('assert')
 
 const NamespacePrefixesMap = class extends Map {
 
-	constructor (schemata, node) {
+	constructor (schemata) {
 	
 		super ()
 		
-		this.schemata = schemata
+		for (const uri of schemata.keys ()) 
 		
-		this.checkNode (node)
-
-	}
-	
-	checkNode ({targetNamespace, attributes, children}) {
-	
-		this.checkURI (targetNamespace)
-	
-		for (const a of Object.values (attributes))
+			this.set (uri, 'ns' + this.size)
 		
-			if (Array.isArray (a) && a.length === 2)
-
-				this.checkURI (a [1])
-
-		for (const i of children) this.checkNode (i)
-	
 	}
-	
-	checkURI (uri) {
 
-		if (this.has (uri)) return
+	QName (localName, namespaceURI) {
 
-		if (!this.schemata.has (uri)) return
+		if (namespaceURI == null) return localName
 
-		this.set (uri, 'ns' + this.size)
+		assert (this.has (namespaceURI), 'Unknown target namespace: ' + namespaceURI)
 
-	}
-	
-	QName (localName, namespaceURI) {
-	
-		if (namespaceURI == null || !this.has (namespaceURI)) return localName
-		
 		return this.get (namespaceURI) + ':' + localName
 	
 	}
 
-	appendTo (buf) {
+	toString () {
+	
+		let s = ''
 
-		for (let [k, v] of this.entries ()) buf [0] += ' xmlns:' + v + '="' + k + '"'
+		for (let [k, v] of this.entries ()) s += ' xmlns:' + v + '="' + k + '"'
+		
+		return s
 
 	}
 

package/lib/XMLMarshaller.js

@@ -1,5 +1,6 @@
 const assert       = require ('assert')
 const stringEscape = require ('string-escape-map')
+const NamespacePrefixesMap = require ('./NamespacePrefixesMap.js')
 
 let esc = [
   ['<', '&lt;'],
@@ -33,33 +34,65 @@ const XMLMarshaller = class {
 
 		this.schemaElement = this.schema.get (localName); assert (this.schemaElement, 'No schema element found for namespaceURI = ' + namespaceURI + ', localName = ' + localName)
 
-		this.ns = this.xs.getNamespacePrefixesMap (this.schemaElement)
+		this.ns = new NamespacePrefixesMap (xs)
+		
+		this.isNsDumped = false
+		
+		this.qNames = []
 
 	}
 	
 	stringify (data, name) {
-		
+
 		const {schemaElement} = this, {targetNamespace, attributes, children} = schemaElement
 
-		const qName = this.ns.QName (name || attributes.name, targetNamespace)
+		this.buf = ''
+
+		this.appendElement (schemaElement, data, this.ns.QName (name || attributes.name, targetNamespace))
+
+		let xml = this.buf
+
+		delete this.buf
 
-		this.buf = ['<' + qName]
+		return xml
+
+	}	
+	
+	appendElement (node, data, qName) {
+
+		this.appendStartTag (node, data, qName)
 		
-		this.ns.appendTo (this.buf)
+		this.appendElementBody (node, data)
 		
-		this.appendAttributes (schemaElement, data)
+		this.appendEndTag ()
 
-		this.buf [0] += '>'
+	}
+	
+	appendStartTag (node, data, qName) {
+	
+		this.qNames.push (qName)
+	
+		this.buf += '<' + qName
 		
-		this.appendElementBody (schemaElement, data)
+		if (!this.isNsDumped) {
 		
-		const xml = this.buf [0] + '</' + qName + '>'
+			this.buf += this.ns
+		
+			this.isNsDumped = true
 
-		delete this.buf
+		}
 
-		return xml
+		this.appendAttributes (node, data)
 
-	}	
+		this.buf += '>'
+
+	}
+
+	appendEndTag () {
+
+		this.buf += '</' + this.qNames.pop () + '>'
+
+	}
 
 	appendNullElement (node) {
 	
@@ -69,7 +102,7 @@ const XMLMarshaller = class {
 		
 		const qName = this.ns.QName (name, targetNamespace)
 
-		this.buf [0] += `<${qName} xsi:nil="true" />`
+		this.buf += `<${qName} xsi:nil="true" />`
 
 	}
 	
@@ -87,7 +120,7 @@ const XMLMarshaller = class {
 			
 		}
 
-		this.buf [0] += this.to_string (data, node.attributes.name, restriction)
+		this.buf += this.to_string (data, node.attributes.name, restriction)
 
 	}
 	
@@ -115,11 +148,11 @@ const XMLMarshaller = class {
 
 				let v = data [name]; if (v == null) return 
 				
-				this.buf [0] += ' ' + this.ns.QName (name, targetNamespace) + '="'
+				this.buf += ' ' + this.ns.QName (name, targetNamespace) + '="'
 								
 				this.appendScalar (this.xs.getByReference (type), v)
 
-				this.buf [0] += '"'
+				this.buf += '"'
 				
 				break
 				
@@ -160,24 +193,12 @@ const XMLMarshaller = class {
 				if (!(name in data)) return
 			
 				let v = data [name]; if (v == null) return this.appendNullElement (node)
-				
-				if (!Array.isArray (v)) v = [v]
 
 				const qName = this.ns.QName (name, targetNamespace)
 				
-				for (const d of Array.isArray (v) ? v : [v]) {
-				
-					this.buf [0] += '<' + qName
-					
-					this.appendAttributes (node, d)
-
-					this.buf [0] += '>'
-					
-					this.appendElementBody (node, d)
-														
-					this.buf [0] += '</' + qName + '>'
+				if (!Array.isArray (v)) return this.appendElement (node, v, qName)
 				
- 				}
+				for (const d of v) this.appendElement (node, d, qName)
 
 				break
 				

package/lib/XMLNode.js

@@ -10,6 +10,10 @@ const PARENT     = Symbol ('_parent')
 const LEVEL      = Symbol ('_level')
 const NS_MAP     = Symbol ('_ns_map')
 
+const m2o = 
+	Object.fromEntries ? m => Object.fromEntries (m.entries ()) :
+	m => {let o = {}; for (const [k, v] of m.entries ()) o [k] = v; return o}
+
 const XMLNode = class extends SAXEvent {
 
 	constructor (src, xmlReader, _type) {
@@ -142,8 +146,6 @@ const XMLNode = class extends SAXEvent {
 				
 			default:
 
-				const m2o = m => Object.fromEntries (m.entries ())
-
 				const {localName, namespaceURI, attributes, children, namespacesMap} = this
 				
 				let r = {

package/lib/XMLSchemata.js

@@ -59,12 +59,6 @@ const XMLSchemata = class extends Map {
 		for (const uri of ns) return this.get (uri)
 	
 	}
-
-	getNamespacePrefixesMap (o) {
-	
-		return new NamespacePrefixesMap (this, o)
-	
-	}
 	
 	createMarshaller (localName, namespaceURI) {
 	

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -219,6 +219,8 @@ async function test_004_schemata (fn) {
 	console.log (xs.stringify ({
   		"ExportDebtRequestsRequest": {Id: 1}	
 	})) 
+
+//	console.log (xs.get ('urn:dom.gosuslugi.ru/debt-responses/1.0.0').get ('AttachmentType')) 
  
 }
 
@@ -330,8 +332,8 @@ async function main () {
 // 	await test_003_emitter_sync ('ent.xml')
 //	await test_003_emitter_sync ('soap.xml')
 	await test_004_schemata ()
-//	await test_005_schemata ()
-//	await test_006_schemata ()
+	await test_005_schemata ()
+	await test_006_schemata ()
 
 }