xml-toolkit 1.0.22 → 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)
 
@@ -172,7 +172,7 @@ const XMLMarshaller = class {
 
 				if (type) {
 
-					this.appendScalar (this.xs.getByReference (type), v)
+					this.appendScalar (this.xs.getType (type), v)
 
 				}
 				else {
@@ -187,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':
@@ -239,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.22",
+  "version": "1.0.23",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/soap.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/test.js

@@ -457,7 +457,7 @@ function test_013_soap () {
 
 	const xs = new XMLSchemata ('test/soap.xsd')
 
-	console.log (xs)
+//	console.log (xs)
 
 	console.log (xs.stringify ({
 		Envelope: {
@@ -482,11 +482,11 @@ 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 ()
+	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 +497,7 @@ async function main () {
 //	test_012_parser ('param_types.xml')
 //	test_012_parser ('20040.wsdl')
 
-test_013_soap ()
+// test_013_soap ()
 	
 }