xml-toolkit 1.1.1 → 1.1.3

package/lib/NamespacesMap.js

@@ -2,6 +2,7 @@ const CH_COLON = ':'.charCodeAt (0)
 
 const XMLNamespace       = 'http://www.w3.org/XML/1998/namespace'
 const XMLNamespacePrefix = 'xml'
+const XSINamespace       = 'http://www.w3.org/2001/XMLSchema-instance'
 
 const DEFAULTS = [
 	[XMLNamespacePrefix,       XMLNamespace],
@@ -75,5 +76,6 @@ const NamespacesMap = class extends Map {
 
 NamespacesMap.XMLNamespace             = XMLNamespace
 NamespacesMap.XMLNamespacePrefix       = XMLNamespacePrefix
+NamespacesMap.XSINamespace             = XSINamespace
 
 module.exports = NamespacesMap

package/lib/XMLIterator.js

@@ -2,6 +2,8 @@ const XMLNode  = require ('./XMLNode.js')
 const SAXEvent = require ('./SAXEvent.js')
 const EntityResolver = require ('./EntityResolver.js')
 
+const CH_LF = '\n'.charCodeAt (0)
+
 const XMLIterator = class {
 
 	constructor (src, options = {}) {
@@ -30,6 +32,26 @@ const XMLIterator = class {
 
 	}
 
+	get linePos () {
+
+		const {pos} = this
+
+		let l = 1, c = -1
+
+		for (let i = pos; i >= 0; i --) {
+
+			if (this.src.charCodeAt (i) !== CH_LF) continue
+
+			l ++; if (c !== -1) continue
+
+			c = pos - i
+
+		}
+
+		return [l, c]
+
+	}
+
 	next () {
 	
 		if (this.selfEnclosed !== null) return this.autoClose ()

package/lib/XMLParser.js

@@ -41,7 +41,7 @@ const XMLParser = class {
 
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
 
-	}
+	}	
 	
 	process (src) {
 	
@@ -84,7 +84,7 @@ const XMLParser = class {
 					this.element = node
 					if (this.document === null) {
 						this.document = node
-						if (this.xs !== null) this.validator = new XMLValidatior (this.xs, node, () => BigInt (nodes.pos))
+						if (this.xs !== null) this.validator = new XMLValidatior (this.xs, node, () => nodes.linePos)
 					}
 					else {
 						if (this.xs !== null) this.validator.startElement (node)
@@ -93,7 +93,7 @@ const XMLParser = class {
 
 				case SAXEvent.TYPES.END_ELEMENT:
 
-					if (this.element === null) throw new Error (`Unbalanced end element tag "${node.text}" occured at position ${nodes.pos}`)
+					if (this.element === null) throw new Error (`Unbalanced end element tag "${node.src}" occured at position ${nodes.pos}`)
 					node ['_ns_map'] = this.element ['_ns_map']
 					this.element.type = type
 					this.element = this.element.parent

package/lib/XMLReader.js

@@ -10,6 +10,8 @@ const OPT_SAX  = Symbol ('_sax')
 
 const NO_CHILDREN = []; NO_CHILDREN.push = () => {}
 
+const CH_LF = '\n'.charCodeAt (0)
+
 const XMLReader = class extends Transform {
 
 	constructor (options = {}) {
@@ -68,12 +70,16 @@ const XMLReader = class extends Transform {
 		this.useNamespaces = options.useNamespaces
 		this.filter        = filter || null
 		this.map           = map || null
+		
+		this.lineNo = 1
+		this.lineStart = 0
 
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
 		
 		this.text = ''
 		this.element = null
-		this.position = 0n
+		this.position = 0
+		this.pos = 0 // TODO: cleanup
 		
 		this [OPT_SRC] = null; this.on ('pipe', src => this [OPT_SRC] = src)
 		
@@ -111,7 +117,7 @@ const XMLReader = class extends Transform {
 
 	process (src, lexerOptions = {}) {
 
-		const lex = new XMLLexer (lexerOptions)
+		const lex = this.lex = new XMLLexer (lexerOptions)
 		
 		lex.once ('error', x => this.destroy (x))
 		
@@ -148,7 +154,7 @@ const XMLReader = class extends Transform {
 		if (!this.validator) switch (xmlNode.type) {
 
 			case SAXEvent.TYPES.START_ELEMENT:									
-				this.validator = new XMLValidatior (this.xs, xmlNode, () => this.position)
+				this.validator = new XMLValidatior (this.xs, xmlNode, () => this.linePos)
 
 			default:
 				return
@@ -244,10 +250,28 @@ const XMLReader = class extends Transform {
 
 	}
 
+	get linePos () {
+
+		return [this.lineNo, this.pos - this.lineStart]
+
+	}
+
 	_transform (chunk, encoding, callback) {
 
 		const {length} = chunk; if (length !== 0) {
 
+			for (let i = 0; i < length; i ++) {
+
+				this.pos ++
+
+				if (chunk.charCodeAt (i) !== CH_LF) continue
+
+				this.lineNo ++
+
+				this.lineStart = this.pos
+
+			}
+
 			let e = new XMLNode (chunk, this.entityResolver), {type} = e, {element} = this
 
 			switch (type) {
@@ -310,7 +334,7 @@ const XMLReader = class extends Transform {
 
 			}
 
-			this.position += BigInt (length)
+			this.position += length
 
 		}		
 

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

@@ -1,3 +1,5 @@
+const {XSINamespace} = require ('../NamespacesMap')
+
 class XMLValidationState {
 
 	#child = null
@@ -49,9 +51,9 @@ class XMLValidationState {
 
 	formatPosition ({src}) {
 
-		const pos = String (this.getPosition () - BigInt (src.length))
+		const [line, char] = this.getPosition ()
 
-		return `${src} at position ${pos}`
+		return `${src} at line ${line}, position ${char}`
 
 	}
 
@@ -114,21 +116,51 @@ 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
 
+				if (attributesMap.getNamespaceURI (name) === XSINamespace) continue
+
 				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}"`)
 
@@ -160,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.1",
+  "version": "1.1.3",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [