xml-toolkit 1.0.8 → 1.0.11

package/lib/NamespacePrefixesMap.js

@@ -2,53 +2,33 @@ const assert = require ('assert')
 
 const NamespacePrefixesMap = class extends Map {
 
-	constructor (schemata, o) {
+	constructor (schemata) {
 	
-		assert.strictEqual (typeof o, 'object')
-
 		super ()
 		
-		this.schemata = schemata
+		for (const uri of schemata.keys ()) 
 		
-		this.add (o)
+			this.set (uri, 'ns' + this.size)
 		
 	}
-	
-	add (o) {
 
-		if (this.isAddedAsNamespaceReference (o)) return
-		
-		for (let v of Object.values (o)) if (typeof v === 'object') this.add (v)
-	
-	}
-	
-	isAddedAsNamespaceReference (a) {
+	QName (localName, namespaceURI) {
 
-		if (!Array.isArray (a)) return false
-		
-		if (a.length !== 2) return false
-		
-		const uri = a [1]
-		
-		if (!this.schemata.has (uri)) return false
+		if (namespaceURI == null) return localName
+
+		assert (this.has (namespaceURI), 'Unknown target namespace: ' + namespaceURI)
 
-		if (this.has (uri)) return true
-		
-		this.set (uri, 'ns' + this.size)
-		
-	}
-	
-	QName (localName, namespaceURI) {
-	
-		if (namespaceURI == null || !this.has (namespaceURI)) return localName
-		
 		return this.get (namespaceURI) + ':' + localName
 	
 	}
 
-	appendTo (buf) {
+	toString () {
+	
+		let s = ''
 
-		for (let [k, v] of this.entries ()) buf [0] += ' xmlns:' + v + '="' + k + '"'
+		for (let [k, v] of this.entries ()) s += ' xmlns:' + v + '="' + k + '"'
+		
+		return s
 
 	}
 

package/lib/XMLMarshaller.js

@@ -1,5 +1,6 @@
 const assert       = require ('assert')
 const stringEscape = require ('string-escape-map')
+const NamespacePrefixesMap = require ('./NamespacePrefixesMap.js')
 
 let esc = [
   ['<', '&lt;'],
@@ -33,33 +34,65 @@ const XMLMarshaller = class {
 
 		this.schemaElement = this.schema.get (localName); assert (this.schemaElement, 'No schema element found for namespaceURI = ' + namespaceURI + ', localName = ' + localName)
 
-		this.ns = this.xs.getNamespacePrefixesMap (this.schemaElement)
+		this.ns = new NamespacePrefixesMap (xs)
+		
+		this.isNsDumped = false
+		
+		this.qNames = []
 
 	}
 	
 	stringify (data, name) {
-		
+
 		const {schemaElement} = this, {targetNamespace, attributes, children} = schemaElement
 
-		const qName = this.ns.QName (name || attributes.name, targetNamespace)
+		this.buf = ''
+
+		this.appendElement (schemaElement, data, this.ns.QName (name || attributes.name, targetNamespace))
+
+		let xml = this.buf
+
+		delete this.buf
+
+		return xml
 
-		this.buf = ['<' + qName]
+	}	
+	
+	appendElement (node, data, qName) {
+
+		this.appendStartTag (node, data, qName)
 		
-		this.ns.appendTo (this.buf)
+		this.appendElementBody (node, data)
 		
-		this.appendAttributes (schemaElement, data)
+		this.appendEndTag ()
 
-		this.buf [0] += '>'
+	}
+	
+	appendStartTag (node, data, qName) {
+	
+		this.qNames.push (qName)
+	
+		this.buf += '<' + qName
+		
+		if (!this.isNsDumped) {
 		
-		this.appendElementBody (schemaElement, data)
+			this.buf += this.ns
 		
-		const xml = this.buf [0] + '</' + qName + '>'
+			this.isNsDumped = true
 
-		delete this.buf
+		}
 
-		return xml
+		this.appendAttributes (node, data)
 
-	}	
+		this.buf += '>'
+
+	}
+
+	appendEndTag () {
+
+		this.buf += '</' + this.qNames.pop () + '>'
+
+	}
 
 	appendNullElement (node) {
 	
@@ -69,7 +102,7 @@ const XMLMarshaller = class {
 		
 		const qName = this.ns.QName (name, targetNamespace)
 
-		this.buf [0] += `<${qName} xsi:nil="true" />`
+		this.buf += `<${qName} xsi:nil="true" />`
 
 	}
 	
@@ -87,7 +120,7 @@ const XMLMarshaller = class {
 			
 		}
 
-		this.buf [0] += this.to_string (data, node.attributes.name, restriction)
+		this.buf += this.to_string (data, node.attributes.name, restriction)
 
 	}
 	
@@ -109,21 +142,17 @@ const XMLMarshaller = class {
 	
 		switch (localName) {
 
-			case 'simpleType':
-
-				return this.appendScalar (node, data)
-
 			case 'attribute':
 
 				if (!(name in data)) return
 
 				let v = data [name]; if (v == null) return 
 				
-				this.buf [0] += ' ' + this.ns.QName (name, targetNamespace) + '="'
+				this.buf += ' ' + this.ns.QName (name, targetNamespace) + '="'
 								
 				this.appendScalar (this.xs.getByReference (type), v)
 
-				this.buf [0] += '"'
+				this.buf += '"'
 				
 				break
 				
@@ -135,6 +164,7 @@ const XMLMarshaller = class {
 			case 'sequence':
 			case 'choice':
 			case 'group':
+			case 'simpleType':
 			
 				return
 
@@ -163,24 +193,12 @@ const XMLMarshaller = class {
 				if (!(name in data)) return
 			
 				let v = data [name]; if (v == null) return this.appendNullElement (node)
-				
-				if (!Array.isArray (v)) v = [v]
 
 				const qName = this.ns.QName (name, targetNamespace)
 				
-				for (const d of Array.isArray (v) ? v : [v]) {
-				
-					this.buf [0] += '<' + qName
-					
-					this.appendAttributes (node, d)
-
-					this.buf [0] += '>'
-					
-					this.appendElementBody (node, d)
-														
-					this.buf [0] += '</' + qName + '>'
+				if (!Array.isArray (v)) return this.appendElement (node, v, qName)
 				
- 				}
+				for (const d of v) this.appendElement (node, d, qName)
 
 				break
 				

package/lib/XMLNode.js

@@ -10,6 +10,10 @@ const PARENT     = Symbol ('_parent')
 const LEVEL      = Symbol ('_level')
 const NS_MAP     = Symbol ('_ns_map')
 
+const m2o = 
+	Object.fromEntries ? m => Object.fromEntries (m.entries ()) :
+	m => {let o = {}; for (const [k, v] of m.entries ()) o [k] = v; return o}
+
 const XMLNode = class extends SAXEvent {
 
 	constructor (src, xmlReader, _type) {
@@ -142,8 +146,6 @@ const XMLNode = class extends SAXEvent {
 				
 			default:
 
-				const m2o = m => Object.fromEntries (m.entries ())
-
 				const {localName, namespaceURI, attributes, children, namespacesMap} = this
 				
 				let r = {

package/lib/XMLReader.js

@@ -214,7 +214,7 @@ const XMLReader = class extends Transform {
 							
 				case SAXEvent.TYPES.END_ELEMENT:
 
-					if (element === null) throw new Error (`Unbalanced end element tag "${chunk}" occured at position ${this.position}`)
+					if (element === null) return callback (new Error (`Unbalanced end element tag "${chunk}" occured at position ${this.position}`))
 
 					e = element
 

package/lib/XMLSchemata.js

@@ -59,12 +59,6 @@ const XMLSchemata = class extends Map {
 		for (const uri of ns) return this.get (uri)
 	
 	}
-
-	getNamespacePrefixesMap (o) {
-	
-		return new NamespacePrefixesMap (this, o)
-	
-	}
 	
 	createMarshaller (localName, namespaceURI) {
 	
@@ -114,7 +108,7 @@ const XMLSchemata = class extends Map {
 			
 		}
 
-		const {targetNamespace} = options, mapper = n => n.detach ({nsMap: true})
+		const {targetNamespace} = options, mapper = n => n.detach ()
 
 		for await (const node of 
 

package/package.json

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

package/test/F9ASyncService.xsd

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://tempuri.org/">
+  <xs:import schemaLocation="F9ASyncService_1.xsd" namespace="http://schemas.datacontract.org/2004/07/GetForm9ASync"/>
+  <xs:element name="GetForm9Async">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="person" nillable="true" type="q1:Person" xmlns:q1="http://schemas.datacontract.org/2004/07/GetForm9ASync"/>
+        <xs:element minOccurs="0" name="address" nillable="true" type="q2:Address" xmlns:q2="http://schemas.datacontract.org/2004/07/GetForm9ASync"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetForm9AsyncResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="GetForm9AsyncResult" nillable="true" type="q3:Responce" xmlns:q3="http://schemas.datacontract.org/2004/07/GetForm9ASync"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetStatus">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="GetStatusResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="GetStatusResult" nillable="true" type="q4:Result" xmlns:q4="http://schemas.datacontract.org/2004/07/GetForm9ASync"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

package/test/F9ASyncService_1.wsdl

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:i0="http://schemas.datacontract.org/2004/07/GetForm9ASync" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:ns0="http://tempuri.org/Imports" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://tempuri.org/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://tempuri.org/">
+
+   <wsdl:types>
+
+      <xsd:schema targetNamespace="http://tempuri.org/Imports" elementFormDefault="unqualified" attributeFormDefault="unqualified">
+         <xsd:import schemaLocation="F9ASyncService.xsd" namespace="http://tempuri.org/" />
+         <xsd:import schemaLocation="F9ASyncService_1_2.xsd" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+         <xsd:import schemaLocation="F9ASyncService_1.xsd" namespace="http://schemas.datacontract.org/2004/07/GetForm9ASync" />
+      </xsd:schema>
+
+   </wsdl:types>
+
+   <wsdl:message name="IF9Service_GetForm9Async_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetForm9Async" />
+   </wsdl:message>
+
+   <wsdl:message name="IF9Service_GetForm9Async_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetForm9AsyncResponse" />
+   </wsdl:message>
+
+   <wsdl:message name="IF9Service_GetStatus_InputMessage">
+      <wsdl:part name="parameters" element="tns:GetStatus" />
+   </wsdl:message>
+
+   <wsdl:message name="IF9Service_GetStatus_OutputMessage">
+      <wsdl:part name="parameters" element="tns:GetStatusResponse" />
+   </wsdl:message>
+
+   <wsdl:portType name="VCKP_F9ASyncService_v2PortType">
+
+      <wsdl:operation name="GetForm9Async">
+         <wsdl:input wsaw:Action="http://tempuri.org/IF9Service/GetForm9Async" message="tns:IF9Service_GetForm9Async_InputMessage" />
+         <wsdl:output wsaw:Action="http://tempuri.org/IF9Service/GetForm9AsyncResponse" message="tns:IF9Service_GetForm9Async_OutputMessage" />
+      </wsdl:operation>
+
+      <wsdl:operation name="GetStatus">
+         <wsdl:input wsaw:Action="http://tempuri.org/IF9Service/GetStatus" message="tns:IF9Service_GetStatus_InputMessage" />
+         <wsdl:output wsaw:Action="http://tempuri.org/IF9Service/GetStatusResponse" message="tns:IF9Service_GetStatus_OutputMessage" />
+      </wsdl:operation>
+   </wsdl:portType>
+
+   <wsdl:binding name="VCKP_F9ASyncService_v2Soap11Binding" type="tns:VCKP_F9ASyncService_v2PortType">
+      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+
+      <wsdl:operation name="GetForm9Async">
+         <soap:operation style="document" soapAction="http://tempuri.org/IF9Service/GetForm9Async" />
+         <wsdl:input>
+            <soap:body use="literal" />
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal" />
+         </wsdl:output>
+      </wsdl:operation>
+
+      <wsdl:operation name="GetStatus">
+         <soap:operation style="document" soapAction="http://tempuri.org/IF9Service/GetStatus" />
+         <wsdl:input>
+            <soap:body use="literal" />
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal" />
+         </wsdl:output>
+      </wsdl:operation>
+   </wsdl:binding>
+
+   <wsdl:service name="VCKP_F9ASyncService_v2">
+      <wsdl:port name="VCKP_F9ASyncService_v2HttpSoap11Endpoint" binding="tns:VCKP_F9ASyncService_v2Soap11Binding">
+         <soap:address location="http://esb.smev.vpn:10180/services/VCKP_F9ASyncService_v2.VCKP_F9ASyncService_v2HttpSoap11Endpoint" />
+      </wsdl:port>
+   </wsdl:service>
+</wsdl:definitions>

package/test/F9ASyncService_1.xsd

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/GetForm9ASync" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.datacontract.org/2004/07/GetForm9ASync">
+  <xs:complexType name="Person">
+    <xs:sequence>
+      <xs:element name="LastName" nillable="true" type="xs:string"/>
+      <xs:element name="FirstName" nillable="true" type="xs:string"/>
+      <xs:element name="SecondName" nillable="true" type="xs:string"/>
+      <xs:element name="BirthDate" type="xs:dateTime"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Person" nillable="true" type="tns:Person"/>
+  <xs:complexType name="Address">
+    <xs:sequence>
+      <xs:element name="Region" nillable="true" type="tns:Dict"/>
+      <xs:element name="Street" nillable="true" type="tns:Dict"/>
+      <xs:element name="House" nillable="true" type="xs:string"/>
+      <xs:element minOccurs="0" name="Block" nillable="true" type="xs:string"/>
+      <xs:element minOccurs="0" name="Flat" nillable="true" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Address" nillable="true" type="tns:Address"/>
+  <xs:complexType name="Dict">
+    <xs:sequence>
+      <xs:element name="Code" type="xs:int"/>
+      <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Dict" nillable="true" type="tns:Dict"/>
+  <xs:complexType name="Responce">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="ID" nillable="true" type="xs:string"/>
+      <xs:element name="Fault" nillable="true" type="tns:Dict"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Responce" nillable="true" type="tns:Responce"/>
+  <xs:complexType name="Result">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="Document" nillable="true" type="xs:string"/>
+      <xs:element name="Status" nillable="true" type="tns:Dict"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Result" nillable="true" type="tns:Result"/>
+</xs:schema>

package/test/F9ASyncService_1_2.xsd

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/">
+  <xs:element name="anyType" nillable="true" type="xs:anyType"/>
+  <xs:element name="anyURI" nillable="true" type="xs:anyURI"/>
+  <xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/>
+  <xs:element name="boolean" nillable="true" type="xs:boolean"/>
+  <xs:element name="byte" nillable="true" type="xs:byte"/>
+  <xs:element name="dateTime" nillable="true" type="xs:dateTime"/>
+  <xs:element name="decimal" nillable="true" type="xs:decimal"/>
+  <xs:element name="double" nillable="true" type="xs:double"/>
+  <xs:element name="float" nillable="true" type="xs:float"/>
+  <xs:element name="int" nillable="true" type="xs:int"/>
+  <xs:element name="long" nillable="true" type="xs:long"/>
+  <xs:element name="QName" nillable="true" type="xs:QName"/>
+  <xs:element name="short" nillable="true" type="xs:short"/>
+  <xs:element name="string" nillable="true" type="xs:string"/>
+  <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/>
+  <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/>
+  <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/>
+  <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/>
+  <xs:element name="char" nillable="true" type="tns:char"/>
+  <xs:simpleType name="char">
+    <xs:restriction base="xs:int"/>
+  </xs:simpleType>
+  <xs:element name="duration" nillable="true" type="tns:duration"/>
+  <xs:simpleType name="duration">
+    <xs:restriction base="xs:duration">
+      <xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?"/>
+      <xs:minInclusive value="-P10675199DT2H48M5.4775808S"/>
+      <xs:maxInclusive value="P10675199DT2H48M5.4775807S"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="guid" nillable="true" type="tns:guid"/>
+  <xs:simpleType name="guid">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:attribute name="FactoryType" type="xs:QName"/>
+  <xs:attribute name="Id" type="xs:ID"/>
+  <xs:attribute name="Ref" type="xs:IDREF"/>
+</xs:schema>

package/test/test.js

@@ -97,10 +97,24 @@ console.log (xml)
 */
 //console.log ([xml, s])
 
+
+	try {
+
+
+
 	const v = await sax.process (xml).findFirst ()
 
 	console.log (JSON.stringify (v, null, 2))
 
+
+	}
+	catch (x) {
+		console.log ({x})
+	}
+
+
+
+
 }
 
 async function test_004_schemata (fn) {
@@ -114,13 +128,13 @@ async function test_004_schemata (fn) {
 	const o = s.get (localName)
 	
 	const nspm = xs.getNamespacePrefixesMap (o)
-*/
 
 	console.log (xs.stringify ({
   		"ExportDebtRequestsRequest": {Id: 1}	
 	}))
+*/
 	
-	if (0) console.log (xs.stringify ({
+	console.log (xs.stringify ({
   "ExportDebtRequestsResponse": {	
     "request-data": {
       "request-id": "bac4c940-6ad3-11eb-9439-0242ac130002",
@@ -216,6 +230,12 @@ async function test_004_schemata (fn) {
 	console.log (xs.get ('urn:dom.gosuslugi.ru/debt-requests/1.0.0').get ('ActionType').restriction)
 */
  
+	console.log (xs.stringify ({
+  		"ExportDebtRequestsRequest": {Id: 1}	
+	})) 
+
+//	console.log (xs.get ('urn:dom.gosuslugi.ru/debt-responses/1.0.0').get ('AttachmentType')) 
+ 
 }
 
 async function test_005_schemata (fn) {
@@ -321,12 +341,12 @@ async function main () {
 //	await test_002_lexer_stream ('param_types.xml')
 //	await test_002_lexer_stream ('not-sa02.xml')
 //	await test_003_emitter_sync ('E05a.xml')
-//	await test_003_emitter_sync ('param_types.xml')
+	await test_003_emitter_sync ('param_types.xml')
 //	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_005_schemata ()
+//	await test_005_schemata ()
 //	await test_006_schemata ()
 
 }