xml-toolkit 1.0.21 → 1.0.23

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)
 
@@ -144,6 +144,18 @@ const XMLMarshaller = class {
 	
 		switch (localName) {
 
+			case 'anyAttribute':
+
+				if (null in data) 
+				
+					for (const o of Object.values (data [null])) 
+					
+						for (const [k, v] of Object.entries (o)) 
+						
+							this.buf += ' ' + k + '="' + XML_ATTR.escape ('' + v) + '"'
+
+				break
+			
 			case 'attribute':
 
 				if (!(name in data)) return
@@ -160,7 +172,7 @@ const XMLMarshaller = class {
 
 				if (type) {
 
-					this.appendScalar (this.xs.getByReference (type), v)
+					this.appendScalar (this.xs.getType (type), v)
 
 				}
 				else {
@@ -175,7 +187,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':
@@ -203,6 +215,10 @@ const XMLMarshaller = class {
 
 		switch (localName) {
 
+			case 'any':
+				if (null in data) for (const xml in data [null]) this.buf += xml
+				break
+
 			case 'simpleType':
 
 				return this.appendScalar (node, data)
@@ -223,7 +239,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,5 @@
+const TYPES = Symbol ('_types')
+
 const XMLSchema = class extends Map {
 
 	constructor (parent, targetNamespace) {
@@ -9,8 +11,14 @@ const XMLSchema = class extends Map {
 		
 		this.isDefaultElementFormQualified   = true
 		this.isAttributeElementFormQualified = false
+		
+		this [TYPES] = new Map ()
 
 	}
+	
+	getType (localName) {
+		return this [TYPES].get (localName)
+	}
 
 	add (node, options = {}) {
 		
@@ -22,12 +30,19 @@ const XMLSchema = class extends Map {
 		if (attributes.attributeFormDefault === 'qualified') this.isAttributeElementFormQualified = true
 		
 		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)
 		

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.21",
+  "version": "1.0.23",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/soap.xsd

@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 envelope
+
+Portions © 2001 DevelopMentor. 
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
+ 
+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 
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
+
+Original W3C files; http://www.w3.org/2001/06/soap-envelope
+Changes made: 
+     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
+     - reverted mustUnderstand to only allow 0 and 1 as lexical values
+	 - made encodingStyle a global attribute 20020825
+	 - removed default value from mustUnderstand attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
+           targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
+
+     
+  <!-- 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:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Header" type="tns:Header" />
+  <xs:complexType name="Header" >
+    <xs:sequence>
+      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </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" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" >
+	  <xs:annotation>
+	    <xs:documentation>
+		  Prose in the spec does not specify that attributes are allowed on the Body element
+		</xs:documentation>
+	  </xs:annotation>
+	</xs:anyAttribute>
+  </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" >	
+     <xs:simpleType>
+     <xs:restriction base='xs:boolean'>
+	   <xs:pattern value='0|1' />
+	 </xs:restriction>
+   </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="actor" type="xs:anyURI" />
+
+  <xs:simpleType name="encodingStyle" >
+    <xs:annotation>
+	  <xs:documentation>
+	    'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+  <xs:attributeGroup name="encodingStyle" >
+    <xs:attribute ref="tns:encodingStyle" />
+  </xs:attributeGroup>
+
+  <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="faultcode" type="xs:QName" />
+      <xs:element name="faultstring" type="xs:string" />
+      <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+      <xs:element name="detail" type="tns:detail" minOccurs="0" />      
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="detail">
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" /> 
+  </xs:complexType>
+
+</xs:schema>
+
+
+
+
+
+

package/test/test.js

@@ -453,6 +453,21 @@ for (const element of doc.children) {
 
 }
 
+function test_013_soap () {
+
+	const xs = new XMLSchemata ('test/soap.xsd')
+
+//	console.log (xs)
+
+	console.log (xs.stringify ({
+		Envelope: {
+			Body: {null: {'<foo>bar</foo>': {Id: 1}}},
+		}
+	}))
+
+}
+
+
 async function main () {
 
 //	await test_001_lexer_sync ('E05a.xml')
@@ -467,12 +482,12 @@ 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')
+	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')
 
 //	test_010_node ()
@@ -481,6 +496,8 @@ async function main () {
 
 //	test_012_parser ('param_types.xml')
 //	test_012_parser ('20040.wsdl')
+
+// test_013_soap ()
 	
 }