xml-toolkit 1.0.53 → 1.0.55

package/lib/XMLMarshaller.js

@@ -2,6 +2,8 @@ const assert       = require ('assert')
 const NamespacePrefixesMap = require ('./NamespacePrefixesMap.js')
 const XMLPrinter = require ('./XMLPrinter.js')
 
+const XSI_TYPE = Symbol.for ('type')
+
 const XMLMarshaller = class {
 
 	constructor (xs, localName, namespaceURI, printerOptions = {}) {
@@ -74,6 +76,15 @@ const XMLMarshaller = class {
 			this.isNsDumped = true
 
 		}
+
+		if (data [XSI_TYPE]) {
+
+			let {targetNamespace} = this.xs.getSchemaByLocalName(data [XSI_TYPE])
+
+			this.printer
+				.writeAttribute ('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+				.writeAttribute ('xsi:type', this.ns.QName (data [XSI_TYPE], targetNamespace))
+		}
 		
 		this.appendAttributes (node, data)
 
@@ -98,6 +109,11 @@ const XMLMarshaller = class {
 
 		const {attributes: {type}, children} = node
 
+		if (data [XSI_TYPE]) {
+			let d = {}; for (let k in data) d [k] = data [k]
+			this.appendElementBody (this.schema.get (data [XSI_TYPE]), d)
+		}
+
 		if (type) return this.appendContent (this.xs.getType (type), data)
 
 		for (const i of children) this.appendContent (i, data)
@@ -111,7 +127,7 @@ const XMLMarshaller = class {
 		if (ref) return this.appendAttributes (this.xs.getByReference (ref), data)
 
 		const {type} = node.attributes; if (type) this.appendAttributes (this.xs.getType (type), data)
-	
+
 		switch (localName) {
 			
 			case 'sequence':

package/lib/XMLReader.js

@@ -211,8 +211,13 @@ const XMLReader = class extends Transform {
 				case SAXEvent.TYPES.CHARACTERS:
 				case SAXEvent.TYPES.CDATA:
 
-					this.text += e.text
-					return callback ()
+					try {
+						this.text += e.text
+						return callback ()
+					}
+					catch (error) {
+						return callback (error)
+					}
 
 				default:
 

package/package.json

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