xml-toolkit 1.0.2 → 1.0.5

package/lib/XMLMarshaller.js

@@ -37,11 +37,29 @@ const XMLMarshaller = class {
 
 	}
 	
-	stringify (content) {
+	stringify (content, name) {
 								
-		const qName = this.ns.QName (this.schemaElement.name, this.schema.targetNamespace)
+		const qName = this.ns.QName (name || this.schemaElement.name, this.schema.targetNamespace)
 
-		const {complexType} = this.schemaElement
+		let {complexType, sequence, choice, all, type} = this.schemaElement, group = sequence || choice || all
+
+		if (type) {
+
+			type = this.xs.getByReference (type)
+
+			switch (type._type) {
+
+				case 'complexType':
+					complexType = type
+					break
+
+				case 'simpleType':
+					simpleType = type
+					break
+
+			}
+
+		}
 
 		let buf = ['<' + qName]
 		
@@ -50,8 +68,9 @@ const XMLMarshaller = class {
 		if (complexType) this._aComplexType (buf, complexType, content)
 
 		buf [0] += '>'
-		
+
 		if (complexType) this._bComplexType (buf, complexType, content)
+		if (group)       this._bSequence    (buf, group, content)
 
 		return buf [0] + '</' + qName + '>'
 
@@ -163,7 +182,7 @@ const XMLMarshaller = class {
 	}
 	
 	to_string (v, type, restriction = {}) {
-		
+
 		const carp = () => {throw new Error (`Invalid value for ${type} type: ${v} (${typeof v})`)}
 	
 		switch (type) {
@@ -192,6 +211,7 @@ const XMLMarshaller = class {
 			case 'dateTime':
 				switch (typeof v) {
 					case 'string':
+						if (v.length === 10) return v + 'T00:00:00'
 						return v
 					case 'number':
 					case 'bigint':
@@ -286,16 +306,22 @@ const XMLMarshaller = class {
 	}
 
 	_bSequence (buf, _sequence, content) {
-		
+
 		const {element, sequence, choice, all} = _sequence, group = sequence || choice || all
 
 		if (group) this._bSequence (buf, group, content)
 
 		if (element) {
-		
-			for (const e of Array.isArray (element) ? element : [element])
-		
-				this._bElement (buf, e, content [e.name])
+
+			for (let e of Array.isArray (element) ? element : [element]) {
+
+				const {ref} = e; if (ref) e = this.xs.getByReference (ref)
+
+				const c = content [e.name]
+
+				this._bElement (buf, e, c)
+				
+			}
 				
 		}
 

package/lib/XMLSchema.js

@@ -86,6 +86,7 @@ XMLSchema.adjustNode = node => {
 
 		case 'attribute':
 		case 'element':
+			splitNs ('ref')
 			splitNs ('type')
 			break
 

package/package.json

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