xml-toolkit 1.0.36 → 1.0.38

package/index.js

@@ -13,6 +13,7 @@ for (const name of [
 	'XMLIterator',
 	'XMLParser',
 	'SOAPFault',
+	'SOAPEncoding',
 
 ]) module.exports [name] = require ('./lib/' + name)
 

package/lib/SOAP11.js

@@ -1,5 +1,6 @@
 const fs          = require ('fs')
 const path        = require ('path')
+const createError = require ('http-errors')
 
 const XMLSchemata = require ('./XMLSchemata.js')
 const XMLReader   = require ('./XMLReader.js')
@@ -22,15 +23,17 @@ const get_xs = () => {
 
 const _fault_xml = ({code, message, actor, detail}) => {
 
-	if (typeof code === 'string') code = {localName: code, namespaceURI: 'http://schemas.xmlsoap.org/soap/envelope/'}
+	let faultcode = code ?? 'Server'
+
+	if (typeof faultcode === 'string') faultcode = {localName: faultcode, namespaceURI: 'http://schemas.xmlsoap.org/soap/envelope/'}
 
 	const Fault = {
-		faultstring: message, 
-		faultcode: code, 
-		faultactor: actor, 
+		faultstring: message,
+		faultcode, 
+		faultactor: actor,
 		detail
 	}
-		
+
 	return get_xs ().stringify ({Fault})
 
 }
@@ -172,6 +175,8 @@ SOAP11.fromFile = async function (fn, options = {}) {
 
 }
 
+SOAP11.createError = fault => createError (500, SOAP11.message (fault), {expose: true, headers: {'Content-Type': _contentType}})
+
 SOAP11.message = _message
 
 module.exports = SOAP11

package/lib/SOAP12.js

@@ -1,6 +1,7 @@
 const path        = require ('path')
 const XMLSchemata = require ('./XMLSchemata.js')
 const SOAPFault   = require ('./SOAPFault.js')
+const createError = require ('http-errors')
 
 let _xs = null
 
@@ -16,6 +17,8 @@ const get_xs = () => {
 
 const _fault_xml = ({code, message, actor, detail, lang}) => {
 
+	if (!code) code = 'Receiver'
+
 	if (typeof code === 'string') code = {localName: code, namespaceURI: 'http://www.w3.org/2003/05/soap-envelope'}
 
 	const Fault = {
@@ -24,7 +27,7 @@ const _fault_xml = ({code, message, actor, detail, lang}) => {
 		Role: actor, 
 		Detail: detail
 	}
-		
+
 	return get_xs ().stringify ({Fault})
 
 }
@@ -75,4 +78,6 @@ SOAP12.contentType = _contentType
 
 SOAP12.message = _message
 
+SOAP12.createError = fault => createError (500, SOAP12.message (fault), {expose: true, headers: {'Content-Type': _contentType}})
+
 module.exports = SOAP12

package/lib/SOAPEncoding.js

@@ -0,0 +1,79 @@
+const util = require ('util')
+
+const NS_XSD     = 'http://www.w3.org/2001/XMLSchema'
+const NS_XSI     = 'http://www.w3.org/2001/XMLSchema-instance'
+const NS_SOAP    = 'http://xml.apache.org/xml-soap'
+const NS_SOAPENC = 'http://schemas.xmlsoap.org/soap/encoding/'
+
+const SOAPEncoding = class {
+
+	constructor (options = {}) {
+
+		this.emptyScalar = options.emptyScalar
+
+	}
+
+	decodeMap ({children}) {
+
+		const result = {}
+
+		for (const {children: [{children: [{src}]}, value]} of children) {
+
+			const v = this.decode (value)
+
+			if (v === undefined) continue
+
+			result [src] = v
+
+		}
+
+		return result
+
+	}
+
+	decodeArray ({children}) {
+
+		return children.map (value => this.decode (value))
+
+	}
+
+	decodeScalar ({children}) {
+
+		if (children.length === 0) return this.emptyScalar
+
+		return children [0].src
+
+	}
+
+	decode (node) {
+
+		const {attributes} = node; if (!attributes) throw Error ('no attributes at all: ' + util.inspect(node))			
+
+		const nil = attributes.get ('nil', NS_XSI); if (nil === 'true' || nil === '1') return null
+
+		const type = attributes.get ('type', NS_XSI); if (!type) throw Error ('xsi:type not defined: ' + util.inspect(node))
+			
+		const [namespacePrefix, localName] = type.split (':'), namespaceURI = attributes._nsMap.get (namespacePrefix)
+
+		switch (namespaceURI) {
+
+			case NS_XSD: return this.decodeScalar (node)
+
+			case NS_SOAP:
+				if (localName !== 'Map') throw Error (`Don't know how to decode ${localName} from ${namespaceURI}`)
+				return this.decodeMap (node)
+
+			case NS_SOAPENC:
+				if (localName !== 'Array') throw Error (`Don't know how to decode ${localName} from ${namespaceURI}`)
+				return this.decodeArray (node)
+
+			default:
+				throw Error (`Don't know how to decode ${localName} from ${namespaceURI}`)
+
+		}
+
+	}
+
+}
+
+module.exports = SOAPEncoding

package/lib/SOAPFault.js

@@ -12,7 +12,7 @@ const SOAPFault = class {
 			this.message = message
 		}
 
-		this.code = 'code' in o ? o.code: 'Server'
+		if ('code' in o) this.code = o.code
 
 		if ('actor' in o) {
 			this.actor = o.actor

package/lib/XMLMarshaller.js

@@ -133,11 +133,11 @@ const XMLMarshaller = class {
 		this.buf += `<${qName} xsi:nil="true" />`
 
 	}
-	
+
 	appendScalar (node, data, restriction = {}) {
 		
 		for (const {localName, attributes, children} of node.children) {
-
+		
 			if (localName === 'restriction') {
 			
 				for (const {localName, attributes: {value}} of children) restriction [localName] = value
@@ -247,8 +247,8 @@ const XMLMarshaller = class {
 
 			case 'simpleType':
 
-				if (data !== null && typeof data === 'object' && !(data instanceof Date)) data = data [null]
-	
+				if (data !== null && typeof data === 'object' && !(data instanceof Date) && node.attributes.name !== 'QName') data = data [null]
+
 				if (data != null) this.appendScalar (node, data)
 				
 				return

package/package.json

@@ -1,25 +1,34 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
-  "files": ["/lib", "/badges"],
+  "files": [
+    "/lib",
+    "/badges"
+  ],
   "scripts": {
     "test": "jest",
     "test-ci": "jest --ci --coverage"
   },
   "jest": {
-	"collectCoverageFrom": [
-		"lib/**/*.js"
-	],
-	"coverageReporters": ["clover", "json", "lcov", "text", "json-summary"],
-  	"verbose": false,
-  	"testPathIgnorePatterns": [
-  		"/node_modules/",
-  		"/__tests__/0ld",
-  		"/__tests__/data",
-  		"/__tests__/lib"
-  	]
+    "collectCoverageFrom": [
+      "lib/**/*.js"
+    ],
+    "coverageReporters": [
+      "clover",
+      "json",
+      "lcov",
+      "text",
+      "json-summary"
+    ],
+    "verbose": false,
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "/__tests__/0ld",
+      "/__tests__/data",
+      "/__tests__/lib"
+    ]
   },
   "repository": {
     "type": "git",
@@ -42,6 +51,7 @@
     "jest": "^29.3.1"
   },
   "dependencies": {
+    "http-errors": "^2.0.0",
     "string-escape-map": "^1.0.0"
   }
 }