xml-toolkit 1.0.17 → 1.0.19

package/README.md

@@ -82,7 +82,7 @@ const data = {ExportDebtRequestsResponse: {
   }
 }
 
-const xs = await XMLSchemata.fromFile ('xs.xsd')
+const xs = new XMLSchemata ('xs.xsd')
 
 const xml = xs.stringify (data)
 
@@ -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/XMLParser.js

@@ -60,8 +60,8 @@ const XMLReader = class {
 				case SAXEvent.TYPES.START_ELEMENT:
 					
 					node.children = []
-					if (this.useNamespaces) node.readNamespaces ()
 					node.parent = this.element
+					if (this.useNamespaces) node.readNamespaces ()
 					this.element = node
 					if (this.document === null) this.document = node
 					break

package/lib/XMLSchema.js

@@ -47,15 +47,23 @@ const XMLSchema = class extends Map {
 
 }
 
-XMLSchema.adjustNode = node => {
+XMLSchema.adjustNode = (node, recurse) => {
 
-	if (node.children) node.children = node.children.filter (i => i.localName !== 'annotation')
+	if (node.children) {
 	
+		node.children = node.children.filter (i => i.localName !== 'annotation')
+
+		if (recurse) node.children = node.children.map (node => XMLSchema.adjustNode (node, true))
+
+	}
+
 	const {attributes, namespacesMap} = node, splitNs = name => {
 		
 		if (!attributes.has (name)) return
-	
-		const [local, prefix] = attributes.get (name).split (':').reverse ()
+		
+		const v = attributes.get (name); if (Array.isArray (v)) return
+
+		const [local, prefix] = v.split (':').reverse ()
 		
 		attributes.set (name, [local, namespacesMap.get (prefix || '')])
 	

package/lib/XMLSchemata.js

@@ -3,6 +3,7 @@ const assert = require ('assert')
 const fs   = require ('fs')
 const path = require ('path')
 
+const XMLParser = require ('./XMLParser.js')
 const XMLReader = require ('./XMLReader.js')
 const XMLNode   = require ('./XMLNode.js')
 const XMLSchema = require ('./XMLSchema.js'), {adjustNode} = XMLSchema
@@ -13,11 +14,19 @@ const IDX = Symbol ('_index')
 
 const XMLSchemata = class extends Map {
 
-	constructor () {
+	constructor (fn) {
 	
 		super ()
 		
 		this [IDX] = new Map ()
+		
+		this.documents = []
+		
+		if (fn) {
+			this.parser = new XMLParser ()
+			this.addFileSync (fn)
+			delete this.parser
+		}
 	
 	}
 	
@@ -126,6 +135,50 @@ const XMLSchemata = class extends Map {
 	
 	}
 
+	addSchemaSync (node, options = {}) {
+	
+		if (node.localName !== 'schema' || node.namespaceURI !== XMLSchema.namespaceURI) {
+		
+			for (const i of node.children) this.addSchemaSync (i, options)
+				
+			return
+			
+		}
+	
+		node = adjustNode (node, true).detach ()
+
+		let targetNamespace = node.attributes.targetNamespace || options.targetNamespace
+
+		if (!this.has (targetNamespace)) this.set (targetNamespace, new XMLSchema (this, targetNamespace))
+
+		const {addLocation} = options; for (const {localName, namespaceURI, attributes} of node.children)
+
+			if (localName === 'import' && namespaceURI === XMLSchema.namespaceURI)
+
+				addLocation (attributes.schemaLocation, attributes.namespace)
+
+		this.get (targetNamespace).add (node)
+
+	}
+
+	addFileSync (fn, options = {}) {
+
+		const dirname = path.dirname (fn), that = this
+
+		options.addLocation = function (schemaLocation, namespace) {
+
+			that.addFileSync (path.join (dirname, schemaLocation), {targetNamespace: namespace})
+
+		}
+
+		const document = this.parser.process (fs.readFileSync (fn, 'utf-8'))
+
+		this.documents.push (document)
+
+		this.addSchemaSync (document, options)
+
+	}
+
 }
 
 XMLSchemata.fromFile = async function (fn, options = {}) {

package/package.json

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

package/test/test.js

@@ -113,6 +113,7 @@ console.log (xml)
 async function test_004_schemata (fn) {
 
 	let xs = await XMLSchemata.fromFile ('test/dom-gosuslugi-ru-smev3-debt-responses.xsd')
+	let xss = new XMLSchemata ('test/dom-gosuslugi-ru-smev3-debt-responses.xsd')
 /*		
 	const localName = 'ImportDebtRequestsRequest'
 	
@@ -127,7 +128,7 @@ async function test_004_schemata (fn) {
 	}))
 */
 	
-	console.log (xs.stringify ({
+	const d = {
   "ExportDebtRequestsResponse": {	
     "request-data": {
       "request-id": "bac4c940-6ad3-11eb-9439-0242ac130002",
@@ -212,7 +213,9 @@ async function test_004_schemata (fn) {
       }
     }
   }
-}))
+}
+	console.log (xs.stringify (d))
+	console.log (xss.stringify (d))
 	
 	//getNamespacePrefixesMap
 /*	
@@ -226,6 +229,9 @@ async function test_004_schemata (fn) {
 	console.log (xs.stringify ({
   		"ExportDebtRequestsRequest": {Id: 1}	
 	})) 
+	console.log (xss.stringify ({
+  		"ExportDebtRequestsRequest": {Id: 1}	
+	})) 
 
 //	console.log (xs.get ('urn:dom.gosuslugi.ru/debt-responses/1.0.0').get ('AttachmentType')) 
  
@@ -234,6 +240,7 @@ async function test_004_schemata (fn) {
 async function test_005_schemata (fn) {
 
 	const xs = await XMLSchemata.fromFile ('test/20040.wsdl')
+	const xss = new XMLSchemata ('test/20040.wsdl')
 	
 	const data = {
 	
@@ -274,26 +281,26 @@ async function test_005_schemata (fn) {
 	
 //	const m = xs.createMarshaller ('AppDataChildDotation', 'http://smev.gosuslugi.ru/rev111111')
 
-	console.log (xs.stringify (
-	
-		{childDotation2Request: {			
-			Message: {
-				TestMsg: "Тестовый запроc",
-			},
-			MessageData: {
-				AppData: {
-					info
-				}
+	const d = {childDotation2Request: {			
+		Message: {
+			TestMsg: "Тестовый запроc",
+		},
+		MessageData: {
+			AppData: {
+				info
 			}
-		}}	
-	
-	))
+		}
+	}}	
+
+	console.log (xs.stringify (d))
+	console.log (xss.stringify (d))
 
 }
 
 async function test_006_schemata (fn) {
 
 	const xs = await XMLSchemata.fromFile ('test/snils-by-additionalData-1.0.1.xsd')
+	const xss = new XMLSchemata ('test/snils-by-additionalData-1.0.1.xsd')
 
 	const data = {
 	  "SnilsByAdditionalDataRequest": {
@@ -321,22 +328,28 @@ async function test_006_schemata (fn) {
 //	const m = xs.createMarshaller ('AppDataChildDotation', 'http://smev.gosuslugi.ru/rev111111')
 
 	console.log (xs.stringify (data))
+	console.log (xss.stringify (data))
 
 }
 
 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)
 
 }
 
 async function test_008_schemata (fn) {
 
 	const xs = await XMLSchemata.fromFile ('test/30017.xsd')
+	const xss = new XMLSchemata ('test/30017.xsd')
 
 	const data = 
 	
@@ -366,10 +379,11 @@ async function test_008_schemata (fn) {
 			}
 		}
 
-//	console.log (xs.stringify (data))
-
 //	console.log (xs)
 
+	console.log (xs.stringify (data))
+	console.log (xss.stringify (data))
+
 }
 
 function test_010_node () {
@@ -423,8 +437,8 @@ function test_012_parser (fn) {
 const parser = new XMLParser  ({})
 const doc = parser.process (xml)
 
-for (const element of doc.detach ().children) {
-  console.log (element.attributes)
+for (const element of doc.children) {
+  console.log (element)
 }
 
 }
@@ -446,14 +460,14 @@ async function main () {
 //	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 ()
 //	test_011_iterator ('param_types.xml')
 //	test_011_iterator ('20040.wsdl')
 
-	test_012_parser ('param_types.xml')
+//	test_012_parser ('param_types.xml')
 //	test_012_parser ('20040.wsdl')
 	
 }