xml-toolkit 1.0.18 → 1.0.19

package/README.md

@@ -99,7 +99,7 @@ const xml = xs.stringify (data)
 const http = require ('http')
 const {SOAP11} = require ('xml-toolkit')
 
-const soap = await SOAP11.fromFile ('their.wsdl')
+const soap = new SOAP11 ('their.wsdl')
 
 const {method, headers, body} = soap.http ({RequestElementNameOfTheirs: {amount: '0.01'}})
 

package/lib/SOAP11.js

@@ -7,9 +7,27 @@ const SOAPHTTP    = require ('./SOAPHTTP.js')
 
 const SOAP11 = class {
 
+	constructor (fn) {
+	
+		this.definitions = []
+		
+		if (fn) {
+		
+			this.xs = new XMLSchemata (fn)
+			
+			for (const doc of this.xs.documents) 
+			
+				if (doc.localName === 'definitions' && doc.namespaceURI === 'http://schemas.xmlsoap.org/wsdl/') 
+				
+					this.definitions.push (doc)
+
+		}
+	
+	}
+
 	getMessageLocalNameByElementLocalName (elementLocalName) {
 	
-		for (const m of this.definitions.children) if (m.localName === 'message') 
+		for (const d of this.definitions) for (const m of d.children) if (m.localName === 'message') 
 
 			for (const p of m.children) if (p.localName === 'part') 
 			
@@ -21,7 +39,7 @@ const SOAP11 = class {
 	
 	getOperationNameByMessageLocalName (messageLocalName) {
 
-		for (const p of this.definitions.children) if (p.localName === 'portType') 
+		for (const d of this.definitions) for (const p of d.children) if (p.localName === 'portType') 
 
 			for (const o of p.children) if (o.localName === 'operation') 
 
@@ -36,7 +54,7 @@ const SOAP11 = class {
 	
 	getSoapActionByOperationName (operationName) {
 
-		for (const b of this.definitions.children) if (b.localName === 'binding') 
+		for (const d of this.definitions) for (const b of d.children) if (b.localName === 'binding') 
 
 			for (const o of b.children) if (o.localName === 'operation' && o.attributes.get ('name') === operationName) 
 
@@ -97,11 +115,13 @@ SOAP11.fromFile = async function (fn, options = {}) {
 	
 	s.xs = await XMLSchemata.fromFile (fn)
 	
-	s.definitions = await new XMLReader ({
+	const nodes = new XMLReader ({
 		filterElements: e => 
 			e.namespaceURI === WSDL.namespaceURI && 
 			e.localName    === 'definitions'
-	}).process (fs.createReadStream (fn)).findFirst ()		
+	}).process (fs.createReadStream (fn))
+
+	for await (const node of nodes) s.definitions.push (node)
 
 	return s
 

package/lib/XMLSchemata.js

@@ -20,6 +20,8 @@ const XMLSchemata = class extends Map {
 		
 		this [IDX] = new Map ()
 		
+		this.documents = []
+		
 		if (fn) {
 			this.parser = new XMLParser ()
 			this.addFileSync (fn)
@@ -166,10 +168,14 @@ const XMLSchemata = class extends Map {
 		options.addLocation = function (schemaLocation, namespace) {
 
 			that.addFileSync (path.join (dirname, schemaLocation), {targetNamespace: namespace})
-			
+
 		}
 
-		this.addSchemaSync (this.parser.process (fs.readFileSync (fn, 'utf-8')), options)
+		const document = this.parser.process (fs.readFileSync (fn, 'utf-8'))
+
+		this.documents.push (document)
+
+		this.addSchemaSync (document, options)
 
 	}
 

package/package.json

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

package/test/test.js

@@ -335,10 +335,14 @@ async function test_006_schemata (fn) {
 async function test_007_wsdl (fn) {
 
 	const soap = await SOAP11.fromFile ('test/20186.wsdl')
+	const soaps = new SOAP11 ('test/20186.wsdl')
+	
+	const d = {GetForm9Sync: {address: {Region: {Code: 78}}}}
 
-	console.log (soap.http ({GetForm9Sync: {address: {Region: {Code: 78}}}}))
+	console.log (soap.http (d))
+	console.log (soaps.http (d))
 
-	console.log (soap)
+//	console.log (soap)
 
 }
 
@@ -453,10 +457,10 @@ async function main () {
 //	await test_003_emitter_sync ('not-sa01.xml')
 // 	await test_003_emitter_sync ('ent.xml')
 //	await test_003_emitter_sync ('soap.xml')
-	await test_004_schemata ()
+//	await test_004_schemata ()
 //	await test_005_schemata ()
 //	await test_006_schemata ()
-//	await test_007_wsdl ()
+	await test_007_wsdl ()
 //	await test_008_schemata ()
 
 //	test_010_node ()