xml-toolkit 1.0.29 → 1.0.30

package/index.js

@@ -14,4 +14,14 @@ for (const name of [
 	'XMLParser',
 	'SOAPFault',
 
-]) module.exports [name] = require ('./lib/' + name)
+]) module.exports [name] = require ('./lib/' + name)
+
+module.exports.SOAP = v => {switch (String (v)) {
+
+	case '1.1': return module.exports.SOAP11
+	
+	case '1.2': return module.exports.SOAP12
+	
+	default: throw new Error ('Unknown SOAP version: ' + v)
+	
+}}

package/lib/NamespacePrefixesMap.js

@@ -1,10 +1,23 @@
 const assert = require ('assert')
+const {
+
+	XMLNamespace,
+	XMLNamespacePrefix,
+	XMLSchemaNamespace,
+	XMLSchemaNamespacePrefix,
+
+} = require ('./NamespacesMap.js')
+
+const DEFAULTS = [
+	[XMLNamespace,       XMLNamespacePrefix],
+	[XMLSchemaNamespace, XMLSchemaNamespacePrefix],
+]
 
 const NamespacePrefixesMap = class extends Map {
 
 	constructor (schemata) {
 
-		super ([['http://www.w3.org/2001/XMLSchema-instance', 'xsi']])
+		super (DEFAULTS)
 		
 		for (const uri of schemata.keys ()) 
 		
@@ -26,7 +39,7 @@ const NamespacePrefixesMap = class extends Map {
 	
 		let s = ''
 
-		for (let [k, v] of this.entries ()) s += ' xmlns:' + v + '="' + k + '"'
+		for (let [k, v] of this.entries ()) if (k !== XMLNamespace) s += ' xmlns:' + v + '="' + k + '"'
 		
 		return s
 

package/lib/NamespacesMap.js

@@ -1,3 +1,14 @@
+const XMLNamespace       = 'http://www.w3.org/XML/1998/namespace'
+const XMLNamespacePrefix = 'xml'
+
+const XMLSchemaNamespace       = 'http://www.w3.org/2001/XMLSchema'
+const XMLSchemaNamespacePrefix = 'xsi'
+
+const DEFAULTS = [
+	[XMLNamespacePrefix,       XMLNamespace],
+	[XMLSchemaNamespacePrefix, XMLSchemaNamespace],
+]
+
 const NamespacesMap = class extends Map {
 
 	constructor (xmlNode) {
@@ -6,7 +17,7 @@ const NamespacesMap = class extends Map {
 		
 		if (parent === null) {
 		
-			super ()
+			super (DEFAULTS)
 		
 		}
 		else {
@@ -45,4 +56,9 @@ const NamespacesMap = class extends Map {
 
 }
 
+NamespacesMap.XMLNamespace             = XMLNamespace
+NamespacesMap.XMLNamespacePrefix       = XMLNamespacePrefix
+NamespacesMap.XMLSchemaNamespace       = XMLSchemaNamespace
+NamespacesMap.XMLSchemaNamespacePrefix = XMLSchemaNamespacePrefix
+
 module.exports = NamespacesMap

package/lib/SOAP12.js

@@ -14,12 +14,12 @@ const get_xs = () => {
 
 }
 
-const _fault_xml = ({code, message, actor, detail}) => {
+const _fault_xml = ({code, message, actor, detail, lang}) => {
 
 	if (typeof code === 'string') code = {localName: code, namespaceURI: 'http://www.w3.org/2003/05/soap-envelope'}
 
 	const Fault = {
-		Reason: {Text: message}, 
+		Reason: {Text: {lang, null: message}},
 		Code: {Value: code}, 
 		Role: actor, 
 		Detail: detail

package/lib/SOAPFault.js

@@ -22,6 +22,8 @@ const SOAPFault = class {
 		}
 
 		if ('detail' in o) this.detail = XMLSchemata.any (o.detail)
+		
+		this.lang = o.lang || 'en'
 
 	}
 

package/lib/XMLMarshaller.js

@@ -172,6 +172,8 @@ const XMLMarshaller = class {
 
 			case 'anyAttribute':
 
+				if (data == null || typeof data !== 'object') return
+
 				if (null in data) 
 				
 					for (const o of Object.values (data [null])) 
@@ -184,6 +186,8 @@ const XMLMarshaller = class {
 			
 			case 'attribute':
 
+				if (data == null || typeof data !== 'object') return
+
 				if (!(name in data)) return
 
 				let v = data [name]; if (v == null) return 
@@ -205,10 +209,6 @@ const XMLMarshaller = class {
 				
 				break
 				
-			case 'extension':
-			
-				this.appendAttributes (this.xs.getType (attributes.base), data)
-
 			case 'any':
 			case 'sequence':
 			case 'choice':
@@ -217,6 +217,10 @@ const XMLMarshaller = class {
 			
 				return
 
+			case 'extension':
+			
+				this.appendAttributes (this.xs.getType (attributes.base), data)
+
 			default:
 
 				for (const i of children) this.appendAttributes (i, data)
@@ -236,12 +240,18 @@ const XMLMarshaller = class {
 		switch (localName) {
 
 			case 'any':
+			
 				if (null in data) for (const xml in data [null]) this.buf += xml
-				break
+				
+				return
 
 			case 'simpleType':
 
-				return this.appendScalar (node, data)
+				if (data !== null && typeof data === 'object') data = data [null]
+	
+				if (data != null) this.appendScalar (node, data)
+				
+				return
 			
 			case 'element':
 
@@ -255,7 +265,7 @@ const XMLMarshaller = class {
 				
 				for (const d of v) this.appendElement (node, d, qName)
 
-				break
+				return
 				
 			case 'extension':
 			

package/lib/XMLSchemata.js

@@ -8,6 +8,7 @@ const XMLReader = require ('./XMLReader.js')
 const XMLNode   = require ('./XMLNode.js')
 const XMLSchema = require ('./XMLSchema.js'), {adjustNode} = XMLSchema
 const NamespacePrefixesMap = require ('./NamespacePrefixesMap.js')
+const {XMLNamespace, XMLSchemaNamespace} = require ('./NamespacesMap.js')
 const XMLMarshaller = require ('./XMLMarshaller.js')
 
 const IDX = Symbol ('_index')
@@ -27,7 +28,7 @@ const XMLSchemata = class extends Map {
 			this.addFileSync (fn)
 			delete this.parser
 		}
-	
+
 	}
 	
 	register (name, targetNamespace) {
@@ -53,15 +54,28 @@ const XMLSchemata = class extends Map {
 			targetNamespace: namespaceURI
 		}
 		
-		return this.get (namespaceURI).getType (localName)
+		const s = this.get (namespaceURI); if (s == null) throw new Error ('Unknown namespace: ' + namespaceURI)
+				
+		return s.getType (localName)
 
 	}
 
 	getByReference (ref) {
 
 		const [localName, namespaceURI] = ref
+		
+		if (namespaceURI === XMLNamespace) return {
+			localName: 'attribute',
+			namespaceURI,
+			attributes: {name: localName, type: ['string', XMLSchemaNamespace]},
+			children: [],
+			namespacesMap: {},
+			targetNamespace: namespaceURI
+		}
+
+		const s = this.get (namespaceURI); if (s == null) throw new Error ('Unknown namespace: ' + namespaceURI)
 				
-		return this.get (namespaceURI).get (localName)
+		return s.get (localName)
 
 	}
 

package/package.json

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

package/test/test.js

@@ -1,6 +1,6 @@
 const fs = require ('fs')
 const assert = require ('assert')
-const {XMLReader, SAXEvent, XMLLexer, AttributesMap, XMLNode, XMLSchemata, SOAP11, SOAP12, EntityResolver, XMLIterator, XMLParser, SOAPFault} = require ('../')
+const {XMLReader, SAXEvent, XMLLexer, AttributesMap, XMLNode, XMLSchemata, SOAP11, SOAP12, EntityResolver, XMLIterator, XMLParser, SOAPFault, SOAP} = require ('../')
 
 async function test_001_lexer_sync (fn) {
 
@@ -388,9 +388,18 @@ async function test_009_schemata (fn) {
 
 	const xs = new XMLSchemata ('test/' + fn)
 
-	console.log (xs)
+//	console.log (xs)
+
+//	console.log (xs.stringify ({AckResponse: null}))
 
-	console.log (xs.stringify ({AckResponse: null}))
+	const data = {
+		AckRequest: {
+//			AckTargetMessage: {Id: 1, accepted: true, null: 2},
+			AckTargetMessage: 11111,
+		}
+	}
+
+	console.log (xs.stringify (data))
 
 }
 
@@ -467,8 +476,8 @@ function test_013_soap () {
 				detail
 			})
 	
-	console.log (SOAP11.message (f))
-	console.log (SOAP12.message (f))
+	console.log (SOAP (1.1).message (f))
+	console.log (SOAP (1.2).message (f))
 
 }
 
@@ -488,13 +497,13 @@ 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_004_schemata ()
+	await test_005_schemata ()
+	await test_006_schemata ()
 	test_007_wsdl ()
-//	await test_008_schemata ()
+	await test_008_schemata ()
 	
-//	test_009_schemata ('smev-message-exchange-service-1.1.xsd')
+	test_009_schemata ('smev-message-exchange-service-1.1.xsd')
 //	test_009_schemata ('sign.xsd')
 
 //	test_010_node ()
@@ -504,7 +513,7 @@ async function main () {
 //	test_012_parser ('param_types.xml')
 //	test_012_parser ('20040.wsdl')
 
-// test_013_soap ()
+test_013_soap ()
 	
 }