xml-toolkit 1.0.22 → 1.0.24

package/lib/XMLMarshaller.js

@@ -82,7 +82,7 @@ const XMLMarshaller = class {
 
 		}
 		
-		const {type} = node.attributes; if (type) this.appendAttributes (this.xs.getByReference (type), data)
+		const {type} = node.attributes; if (type) this.appendAttributes (this.xs.getType (type), data)
 
 		this.appendAttributes (node, data)
 
@@ -116,7 +116,7 @@ const XMLMarshaller = class {
 			
 				for (const {localName, attributes: {value}} of children) restriction [localName] = value
 			
-				return this.appendScalar (this.xs.getByReference (attributes.base), data, restriction)
+				return this.appendScalar (this.xs.getType (attributes.base), data, restriction)
 				
 			}
 			
@@ -130,7 +130,7 @@ const XMLMarshaller = class {
 
 		const {attributes: {type}, children} = node
 
-		if (type) return this.appendContent (this.xs.getByReference (type), data)
+		if (type) return this.appendContent (this.xs.getType (type), data)
 
 		for (const i of children) this.appendContent (i, data)
 
@@ -162,17 +162,11 @@ const XMLMarshaller = class {
 
 				let v = data [name]; if (v == null) return 
 				
-				this.buf += ' ' + (
-				
-					this.xs.get (targetNamespace).isAttributeElementFormQualified ? this.ns.QName (name, targetNamespace)
-					
-					: name
-					
-				) + '="'
+				this.buf += ' ' + this.ns.QName (name, targetNamespace) + '="'
 
 				if (type) {
 
-					this.appendScalar (this.xs.getByReference (type), v)
+					this.appendScalar (this.xs.getType (type), v)
 
 				}
 				else {
@@ -187,7 +181,7 @@ const XMLMarshaller = class {
 				
 			case 'extension':
 			
-				this.appendAttributes (this.xs.getByReference (attributes.base), data)
+				this.appendAttributes (this.xs.getType (attributes.base), data)
 
 			case 'any':
 			case 'sequence':
@@ -239,7 +233,7 @@ const XMLMarshaller = class {
 				
 			case 'extension':
 			
-				this.appendContent (this.xs.getByReference (attributes.base), data)
+				this.appendContent (this.xs.getType (attributes.base), data)
 				
 			default:
 

package/lib/XMLSchema.js

@@ -1,3 +1,8 @@
+const TYPES = Symbol ('_types')
+
+const FORM_U = 'unqualified'
+const FORM_Q =   'qualified'
+
 const XMLSchema = class extends Map {
 
 	constructor (parent, targetNamespace) {
@@ -5,29 +10,41 @@ const XMLSchema = class extends Map {
 		super ()
 	
 		this.parent = parent
+		
 		this.targetNamespace = targetNamespace
 		
-		this.isDefaultElementFormQualified   = true
-		this.isAttributeElementFormQualified = false
+		this.formDefault = {}
+		
+		this [TYPES] = new Map ()
 
 	}
+	
+	getType (localName) {
+		return this [TYPES].get (localName)
+	}
 
 	add (node, options = {}) {
-		
-		this.copyTargetNamespace (node)
-	
+			
 		const {attributes, children} = node
+		
+		for (const name of ['element', 'attribute']) this.formDefault [name] = attributes [name + 'FormDefault'] || FORM_U
 
-		if (attributes.elementFormDefault === 'unqualified') this.isDefaultElementFormQualified = false
-		if (attributes.attributeFormDefault === 'qualified') this.isAttributeElementFormQualified = true
+		this.copyTargetNamespace (node)
 		
 		for (const e of children) {
-		
-			const {attributes} = e; if (!('name' in attributes)) continue
+
+			const {localName, attributes} = e; if (!('name' in attributes)) continue
 			
 			const {name} = attributes
-
-			this.set (name, e)
+			
+			switch (localName) {
+				case 'complexType':
+				case 'simpleType':
+					this [TYPES].set (name, e)
+					break
+				default:
+					this.set (name, e)
+			}
 			
 			this.parent.register (name, this.targetNamespace)
 		
@@ -35,13 +52,27 @@ const XMLSchema = class extends Map {
 
 	}
 	
-	copyTargetNamespace (node) {
+	copyTargetNamespace (node, force = false) {
 
 		if (typeof node !== 'object') return		
+		
+		const {localName} = node
+		
+		for (const e of node.children) this.copyTargetNamespace (e, localName === 'schema')
+		
+		if ('targetNamespace' in node) return
+		
+		const {formDefault} = this; if (!(localName in formDefault)) return
+		
+		if (!force) {
+		
+			const {form} = node.attributes
+						
+			if (form !== FORM_Q && formDefault [localName] !== FORM_Q) return
+		
+		}
 
-		node.targetNamespace = this.targetNamespace
-			
-		for (const e of node.children) this.copyTargetNamespace (e)
+		node.targetNamespace = this.targetNamespace		
 	
 	}
 

package/lib/XMLSchemata.js

@@ -40,10 +40,10 @@ const XMLSchemata = class extends Map {
 	
 	}
 	
-	getByReference (ref) {
+	getType (ref) {
 
 		const [localName, namespaceURI] = ref
-		
+
 		if (namespaceURI === XMLSchema.namespaceURI) return {
 			localName: 'simpleType',
 			namespaceURI,
@@ -53,10 +53,18 @@ const XMLSchemata = class extends Map {
 			targetNamespace: namespaceURI
 		}
 		
+		return this.get (namespaceURI).getType (localName)
+
+	}
+
+	getByReference (ref) {
+
+		const [localName, namespaceURI] = ref
+				
 		return this.get (namespaceURI).get (localName)
 
 	}
-	
+
 	getSchemaByLocalName (localName) {
 	
 		const ns = this [IDX].get (localName)

package/package.json

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

package/test/{soap.xsd → soap-1.1.xsd}

@@ -57,8 +57,8 @@ The name and trademarks of copyright holders may NOT be used in advertising or p
   </xs:complexType>
   
 
-  <xs:element name="Body" type="tns:Body_" />  
-  <xs:complexType name="Body_" >
+  <xs:element name="Body" type="tns:Body" />  
+  <xs:complexType name="Body" >
     <xs:sequence>
       <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
     </xs:sequence>

package/test/soap-1.2.xsd

@@ -0,0 +1,166 @@
+<!-- Schema defined in the SOAP Version 1.2 Part 1 specification
+     Recommendation:
+     http://www.w3.org/TR/2003/REC-soap12-part1-20030624/
+     $Id: soap-envelope.xsd,v 1.2 2006/12/20 20:43:36 ylafon Exp $
+
+     Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
+     W3C viability, trademark, document use and software licensing rules
+     apply.
+     http://www.w3.org/Consortium/Legal/
+
+     This document is governed by the W3C Software License [1] as
+     described in the FAQ [2].
+
+     [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+     [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://www.w3.org/2003/05/soap-envelope"
+           targetNamespace="http://www.w3.org/2003/05/soap-envelope" 
+		   elementFormDefault="qualified" >
+<!--
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" 
+             schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+-->
+
+  <!-- Envelope, header and body -->
+  <xs:element name="Envelope" type="tns:Envelope" />
+  <xs:complexType name="Envelope" >
+    <xs:sequence>
+      <xs:element ref="tns:Header" minOccurs="0" />
+      <xs:element ref="tns:Body" minOccurs="1" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Header" type="tns:Header" />
+  <xs:complexType name="Header" >
+    <xs:annotation>
+	  <xs:documentation>
+	  Elements replacing the wildcard MUST be namespace qualified, but can be in the targetNamespace
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:sequence>
+      <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"  />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+  
+  <xs:element name="Body" type="tns:Body" />
+  <xs:complexType name="Body" >
+    <xs:sequence>
+      <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <!-- Global Attributes.  The following attributes are intended to be
+  usable via qualified attribute names on any complex type referencing
+  them.  -->
+  <xs:attribute name="mustUnderstand" type="xs:boolean" default="0" />
+  <xs:attribute name="relay" type="xs:boolean" default="0" />
+  <xs:attribute name="role" type="xs:anyURI" />
+
+  <!-- 'encodingStyle' indicates any canonicalization conventions
+  followed in the contents of the containing element.  For example, the
+  value 'http://www.w3.org/2003/05/soap-encoding' indicates the pattern
+  described in the SOAP Version 1.2 Part 2: Adjuncts Recommendation -->
+
+  <xs:attribute name="encodingStyle" type="xs:anyURI" />
+
+  <xs:element name="Fault" type="tns:Fault" />
+  <xs:complexType name="Fault" final="extension" >
+    <xs:annotation>
+	  <xs:documentation>
+	    Fault reporting structure
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:sequence>
+      <xs:element name="Code" type="tns:faultcode" />
+      <xs:element name="Reason" type="tns:faultreason" />
+      <xs:element name="Node" type="xs:anyURI" minOccurs="0" />
+	  <xs:element name="Role" type="xs:anyURI" minOccurs="0" />
+      <xs:element name="Detail" type="tns:detail" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="faultreason" >
+    <xs:sequence>
+	  <xs:element name="Text" type="tns:reasontext" 
+                  minOccurs="1"  maxOccurs="unbounded" />
+	</xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="reasontext" >
+    <xs:simpleContent>
+	  <xs:extension base="xs:string" >
+	    <xs:attribute ref="xml:lang" use="required" />
+	  </xs:extension>
+	</xs:simpleContent>
+  </xs:complexType>
+  
+  <xs:complexType name="faultcode">
+    <xs:sequence>
+      <xs:element name="Value"
+                  type="tns:faultcodeEnum"/>
+      <xs:element name="Subcode"
+                  type="tns:subcode"
+                  minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="faultcodeEnum">
+    <xs:restriction base="xs:QName">
+      <xs:enumeration value="tns:DataEncodingUnknown"/>
+      <xs:enumeration value="tns:MustUnderstand"/>
+      <xs:enumeration value="tns:Receiver"/>
+      <xs:enumeration value="tns:Sender"/>
+      <xs:enumeration value="tns:VersionMismatch"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="subcode">
+    <xs:sequence>
+      <xs:element name="Value"
+                  type="xs:QName"/>
+      <xs:element name="Subcode"
+                  type="tns:subcode"
+                  minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="detail">
+    <xs:sequence>
+      <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"  />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" /> 
+  </xs:complexType>
+
+  <!-- Global element declaration and complex type definition for header entry returned due to a mustUnderstand fault -->
+  <xs:element name="NotUnderstood" type="tns:NotUnderstoodType" />
+  <xs:complexType name="NotUnderstoodType" >
+    <xs:attribute name="qname" type="xs:QName" use="required" />
+  </xs:complexType>
+
+
+  <!-- Global element and associated types for managing version transition as described in Appendix A of the SOAP Version 1.2 Part 1 Recommendation  -->  <xs:complexType name="SupportedEnvType" >
+    <xs:attribute name="qname" type="xs:QName" use="required" />
+  </xs:complexType>
+
+  <xs:element name="Upgrade" type="tns:UpgradeType" />
+  <xs:complexType name="UpgradeType" >
+    <xs:sequence>
+	  <xs:element name="SupportedEnvelope" type="tns:SupportedEnvType" minOccurs="1" maxOccurs="unbounded" />
+	</xs:sequence>
+  </xs:complexType>
+
+
+</xs:schema>
+
+
+
+
+
+
+

package/test/test.js

@@ -455,16 +455,106 @@ for (const element of doc.children) {
 
 function test_013_soap () {
 
-	const xs = new XMLSchemata ('test/soap.xsd')
-
-	console.log (xs)
+	const xs11 = new XMLSchemata ('test/soap-1.1.xsd')
 
+//	console.log (xs.get ('http://schemas.xmlsoap.org/soap/envelope/'))
+//	console.log (xs.get ('http://schemas.xmlsoap.org/soap/envelope/').getType ('Fault').children[0].children)
+//	console.log (xs.getType ('Fault'))	
+	
+/*
 	console.log (xs.stringify ({
 		Envelope: {
 			Body: {null: {'<foo>bar</foo>': {Id: 1}}},
 		}
 	}))
 
+
+			<faultcode>SOAP-ENV:Client</faultcode>
+			<faultstring>Message does not have necessary info</faultstring>
+			<faultactor>http://gizmos.com/order</faultactor>
+			<detail>
+				<PO:order xmlns:PO="http://gizmos.com/orders/">Quantity element does not have a value</PO:order>
+				<PO:confirmation xmlns:PO="http://gizmos.com/confirm">Incomplete address: no zip code</PO:confirmation>
+			</detail>
+
+
+*/
+
+	let Fault = {
+		faultcode: 'SOAP-ENV:Client',
+		faultstring: 'Message does not have necessary info',
+		faultactor: 'http://gizmos.com/order',
+		detail: {
+			null: {
+				[`
+					<PO:order xmlns:PO="http://gizmos.com/orders/">Quantity element does not have a value</PO:order>
+					<PO:confirmation xmlns:PO="http://gizmos.com/confirm">Incomplete address: no zip code</PO:confirmation>
+				`]: {}
+			}
+		}
+	}
+
+	const soap11 = {
+		Envelope: {
+			Body: {
+				null: {
+					[xs11.stringify ({Fault})]: {}
+				}
+			}
+		}
+	}
+
+/*
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
+	<env:Header/>
+	<env:Body>
+		<env:Fault>
+			<env:Code>
+				<env:Value>env:Sender</env:Value>
+			</env:Code>
+			<env:Reason>
+				<env:Text xml:lang="en-US">Message does not have necessary info</env:Text>
+			</env:Reason>
+			<env:Role>http://gizmos.com/order</env:Role>
+			<env:Detail>
+				<PO:order xmlns:PO="http://gizmos.com/orders/">Quantity element does not have a value</PO:order>
+				<PO:confirmation xmlns:PO="http://gizmos.com/confirm">Incomplete address: no zip code</PO:confirmation>
+			</env:Detail>
+		</env:Fault>
+	</env:Body>
+</env:Envelope>
+*/
+
+	console.log (xs11.stringify (soap11))
+	
+	const xs12 = new XMLSchemata ('test/soap-1.2.xsd')
+
+	Fault = {
+		Code: {Value: 'env:Sender'},
+		Reason: {Text: 'Message does not have necessary info'},
+		Role: 'http://gizmos.com/order',
+		Detail: {
+			null: {
+				[`
+					<PO:order xmlns:PO="http://gizmos.com/orders/">Quantity element does not have a value</PO:order>
+					<PO:confirmation xmlns:PO="http://gizmos.com/confirm">Incomplete address: no zip code</PO:confirmation>
+				`]: {}
+			}
+		}
+	}
+	
+	const soap12 = {
+		Envelope: {
+			Body: {
+				null: {
+					[xs12.stringify ({Fault})]: {}
+				}
+			}
+		}
+	}
+
+	console.log (xs12.stringify (soap12))
+
 }
 
 
@@ -482,11 +572,13 @@ 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_005_schemata ()
 //	await test_006_schemata ()
 //	await test_007_wsdl ()
 //	await test_008_schemata ()
+	
 //	test_009_schemata ('smev-message-exchange-service-1.1.xsd')
 //	test_009_schemata ('sign.xsd')
 
@@ -497,7 +589,7 @@ async function main () {
 //	test_012_parser ('param_types.xml')
 //	test_012_parser ('20040.wsdl')
 
-test_013_soap ()
+ test_013_soap ()
 	
 }