xml-toolkit 1.1.2 → 1.1.3

package/lib/XMLSchema.js

@@ -15,10 +15,26 @@ const XMLSchema = class extends Map {
 
 		this [TYPES] = new Map ()
 
-		{(this.parent = parent).set (this.targetNamespace = targetNamespace, this)}
+		this.targetNamespace = targetNamespace
+		this.parent = parent
 
 		this.setSource (node)
 
+		if (this.parent.has (targetNamespace)) {
+
+			const existing = this.parent.get (targetNamespace)
+
+			for (const [k, v] of this.entries ()) existing.set (k, v)
+				
+			for (const [k, v] of this [TYPES].entries ()) existing [TYPES].set (k, v)
+
+		}
+		else {
+
+			this.parent.set (targetNamespace, this)
+
+		}
+
 	}
 
 	adjustNode (node) {
@@ -51,6 +67,7 @@ const XMLSchema = class extends Map {
 			case 'group':
 				splitNs ('ref')
 				splitNs ('type')
+				splitNs ('substitutionGroup')
 				break
 	
 			case 'extension':

package/lib/XMLSchemata.js

@@ -50,8 +50,8 @@ const XMLSchemata = class extends Map {
 	
 	}
 
-	getType ([localName, namespaceURI]) {
-	
+	getType ([localName, namespaceURI]) {		
+
 		const schema = this.get (namespaceURI); if (schema == null) throw new Error ('Unknown namespace: ' + namespaceURI)
 
 		const node = schema.getType (localName)
@@ -234,12 +234,22 @@ const XMLSchemata = class extends Map {
 		
 		const schema = new XMLSchema (this, targetNamespace, node)
 			
-		for (const {localName, namespaceURI, attributes: {schemaLocation, namespace}} of schema._src.children)
+		for (const {localName, namespaceURI, attributes: {schemaLocation, namespace}} of schema._src.children) {
 
-			if (localName === 'import' && namespaceURI === XMLSchema.namespaceURI && namespace !== NamespacesMap.XMLNamespace)
+			if (localName === 'import' && namespaceURI === XMLSchema.namespaceURI && namespace !== NamespacesMap.XMLNamespace) {
 
 				this.addFile (path.join (options.dirname, schemaLocation), {targetNamespace: namespace})
 
+			}
+
+			if (localName === 'include' && namespaceURI === XMLSchema.namespaceURI) {
+
+				this.addFile (path.join (options.dirname, schemaLocation), {targetNamespace})
+
+			}
+
+		}
+
 	}
 
 	addFile (fn, options = {}) {

package/lib/validation/MatchElement.js

@@ -6,11 +6,22 @@ class MatchElement extends Match {
 
         const {node: {attributes: {name}, targetNamespace}} = this.occurable
 
-        if (localName !== name || namespaceURI != targetNamespace) return null
+        if (localName === name && namespaceURI == targetNamespace) {
+
+            this.occured ++
+
+            return this.occurable.node
+
+        }
+
+        const el = this.occurable.xs?.getSchema (namespaceURI)?.get (localName)
+        const sg = el?.attributes?.substitutionGroup
+
+        if (!sg || sg [0] !== name || sg [1] !== targetNamespace) return null
 
         this.occured ++
 
-        return this.occurable.node
+        return el
 
     }
 

package/lib/validation/XMLValidationState.js

@@ -116,13 +116,39 @@ class XMLValidationState {
 
 	}
 
+	resolveAttribute (name, attributesMap) {
+
+		const {attributes} = this.anyType
+
+		if (attributes.has (name)) {
+
+			const def = attributes.get (name)
+
+			if (!def.targetNamespace || def.targetNamespace === attributesMap.getNamespaceURI (name)) return def
+
+		}
+
+		const localName = attributesMap.getLocalName (name); if (localName === name) return null
+
+		const def = attributes.get (localName); if (!def) return null
+
+		if (def.targetNamespace !== attributesMap.getNamespaceURI (name)) return null
+
+		return def
+
+	}
+
 	validateAttributes (attributesMap) {
 
 		const {attributes, isAnyAttributeAllowed} = this.anyType
 
+		const matched = new Set ()
+
 		for (const [name, value] of attributesMap) {
 
-			if (!attributes.has (name)) {
+			const def = this.resolveAttribute (name, attributesMap)
+
+			if (!def) {
 
 				if (isAnyAttributeAllowed) continue
 
@@ -131,8 +157,10 @@ class XMLValidationState {
 				throw Error (`Unknown attribute: "${name}"`)
 
 			}
-			
-			const def = attributes.get (name), {attributes: {fixed, type}} = def
+
+			matched.add (def)
+
+			const {attributes: {fixed, type}} = def
 
 			if (typeof fixed === 'string' && value !== fixed) throw Error (`The attribute "${name}" must have the value "${fixed}", not "${value}"`)
 
@@ -164,7 +192,7 @@ class XMLValidationState {
 
 		}
 
-		for (const [name, def] of attributes) if (!attributesMap.has (name)) {
+		for (const [name, def] of attributes) if (!matched.has (def)) {
 
 			if (def.attributes.use === 'required') throw Error (`Missing required attribute: "${name}"`)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [