xml-toolkit 1.1.2 → 1.1.4

package/lib/XMLIterator.js

@@ -1,18 +1,19 @@
 const XMLNode  = require ('./XMLNode.js')
 const SAXEvent = require ('./SAXEvent.js')
 const EntityResolver = require ('./EntityResolver.js')
-
-const CH_LF = '\n'.charCodeAt (0)
+const XMLPosition = require ('./XMLPosition.js')
 
 const XMLIterator = class {
 
+	#position = new XMLPosition ()
+
 	constructor (src, options = {}) {
 	
-		this.src          = src
-		this.options      = options
-		this.pos          = 0
-		this.selfEnclosed = null
-		this.entityResolver = options.entityResolver ?? new EntityResolver ()
+		this.src              = src
+		this.options          = options
+		this.absolutePosition = 0
+		this.selfEnclosed     = null
+		this.entityResolver   = options.entityResolver ?? new EntityResolver ()
 
 	}
 	
@@ -34,21 +35,7 @@ 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]
+		return this.#position.toJSON ()
 
 	}
 
@@ -56,18 +43,24 @@ const XMLIterator = class {
 	
 		if (this.selfEnclosed !== null) return this.autoClose ()
 	
-		const {src, pos, entityResolver} = this
+		const {src, absolutePosition, entityResolver} = this
 
-		if (src.length - pos < 1) return {done: true}
+		if (src.length - absolutePosition < 1) return {done: true}
 		
-		const value = new XMLNode (src.slice (pos), entityResolver)
+		const value = new XMLNode (src.slice (absolutePosition), entityResolver)
 
 		value.trim ()
-		
-		const {length} = value.src; if (length === 0) return {done: true}
 
-		this.pos += length
+		{
+
+			const {src} = value, {length} = src; if (length === 0) return {done: true}
 
+			this.absolutePosition += length
+
+			this.#position.scan (src)
+
+		}
+		
 		if (value.isStartElement && value.isSelfEnclosed) this.selfEnclosed = value
 
 		return {value}

package/lib/XMLParser.js

@@ -93,7 +93,7 @@ const XMLParser = class {
 
 				case SAXEvent.TYPES.END_ELEMENT:
 
-					if (this.element === null) throw new Error (`Unbalanced end element tag "${node.src}" occured at position ${nodes.pos}`)
+					if (this.element === null) throw new Error (`Unbalanced end element tag "${node.src}" occured at position ${nodes.absolutePosition}`)
 					node ['_ns_map'] = this.element ['_ns_map']
 					this.element.type = type
 					this.element = this.element.parent

package/lib/XMLPosition.js

@@ -0,0 +1,37 @@
+const CH_LF = '\n'.charCodeAt (0)
+
+class XMLPosition {
+
+	#line = 0
+	#localPosition = 0
+	#lastLine = 0
+	#lastLocalPosition = 0
+
+	scan (chunk) {
+
+		this.#lastLine = this.#line
+		this.#lastLocalPosition = this.#localPosition
+
+		for (let i = 0; i < chunk.length; i ++) switch (chunk.charCodeAt (i)) {
+
+			case CH_LF:
+				this.#line ++
+				this.#localPosition = 0
+				break
+
+			default:
+				this.#localPosition ++
+
+		}
+
+	}
+
+	toJSON () {
+
+    	return [this.#lastLine + 1, this.#lastLocalPosition + 1]
+
+	}	
+	
+}
+
+module.exports = XMLPosition

package/lib/XMLReader.js

@@ -1,8 +1,9 @@
-const assert      = require ('assert')
-const {Transform} = require ('stream')
-const SAXEvent    = require ('./SAXEvent.js')
-const XMLNode     = require ('./XMLNode.js')
-const XMLLexer    = require ('./XMLLexer.js')
+const assert        = require ('assert')
+const {Transform}   = require ('stream')
+const SAXEvent      = require ('./SAXEvent.js')
+const XMLNode       = require ('./XMLNode.js')
+const XMLLexer      = require ('./XMLLexer.js')
+const XMLPosition   = require ('./XMLPosition.js')
 const XMLValidatior = require ('./validation/XMLValidatior.js')
 
 const OPT_SRC  = Symbol ('_src')
@@ -10,10 +11,10 @@ const OPT_SAX  = Symbol ('_sax')
 
 const NO_CHILDREN = []; NO_CHILDREN.push = () => {}
 
-const CH_LF = '\n'.charCodeAt (0)
-
 const XMLReader = class extends Transform {
 
+	#position = new XMLPosition ()
+
 	constructor (options = {}) {
 
 		options.decodeStrings = false
@@ -70,16 +71,15 @@ const XMLReader = class extends Transform {
 		this.useNamespaces = options.useNamespaces
 		this.filter        = filter || null
 		this.map           = map || null
-		
-		this.lineNo = 1
-		this.lineStart = 0
+	
+		this.line = 0
+		this.localPosition = 0
 
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
 		
 		this.text = ''
 		this.element = null
 		this.position = 0
-		this.pos = 0 // TODO: cleanup
 		
 		this [OPT_SRC] = null; this.on ('pipe', src => this [OPT_SRC] = src)
 		
@@ -252,7 +252,7 @@ const XMLReader = class extends Transform {
 
 	get linePos () {
 
-		return [this.lineNo, this.pos - this.lineStart]
+		return this.#position.toJSON ()
 
 	}
 
@@ -260,17 +260,7 @@ const XMLReader = class extends Transform {
 
 		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
-
-			}
+			this.#position.scan (chunk)
 
 			let e = new XMLNode (chunk, this.entityResolver), {type} = e, {element} = this
 

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.4",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [