xml-toolkit 1.1.4 → 1.1.6

package/README.md

@@ -30,6 +30,8 @@ const parser = new XMLParser  ({
 
 const document = parser.process (xml)
 
+// console.log (parser.validationMessages)
+
 for (const element of document.detach ().children) {
   console.log (element.attributes)
 }
@@ -46,7 +48,9 @@ const records = new XMLReader ({
 //xs,
   filterElements : 'Record', 
   map            : XMLNode.toObject ({})
-}).process (xmlSource)
+})
+//.on ('validation-message', s => console.log (s))
+  .process (xmlSource)
 
 // ...then:
 // await someLoader.load (records)

package/index.js

@@ -31,6 +31,7 @@ module.exports = {
 	XMLSchema:           require ('./lib/XMLSchema'),
 	XMLSchemaBuiltIn:    require ('./lib/XMLSchemaBuiltIn'),
 	XMLSchemata:         require ('./lib/XMLSchemata'),
+	XMLMessages:         require ('./lib/XMLMessages'),
 	XSSimpleType,
 	XSSimpleTypeFloat,
 	XSSimpleTypeDouble,

package/lib/XMLIterator.js

@@ -33,9 +33,9 @@ const XMLIterator = class {
 
 	}
 
-	get linePos () {
+	get position () {
 
-		return this.#position.toJSON ()
+		return this.#position
 
 	}
 

package/lib/XMLLexer.js

@@ -1,6 +1,7 @@
 const assert      = require ('assert')
 const {Transform} = require ('stream')
 const {StringDecoder} = require('string_decoder')
+const XMLPosition   = require ('./XMLPosition.js')
 
 const ST_TEXT  = 0
 const ST_LT	   = 1
@@ -23,6 +24,8 @@ const S_ENCODING = Symbol ('encoding')
 
 const XMLLexer = class extends Transform {
 
+	#position = new XMLPosition ()
+
 	constructor (options = {}) {
 
 		options.readableObjectMode = true
@@ -51,6 +54,12 @@ const XMLLexer = class extends Transform {
 
 	}
 
+	get position () {
+
+		return this.#position
+
+	}
+
 	isClosing (pos) {
 
 		const {awaited, body} = this, {length} = awaited; if (length === 0) return true
@@ -74,7 +83,7 @@ const XMLLexer = class extends Transform {
 
 			default:
 				assert (awaited === null, 'not ST_TAG[_X]: awaited must be null')
-				this.position = 0
+				this.xPosition = 0
 				break
 
 		}
@@ -155,7 +164,7 @@ const XMLLexer = class extends Transform {
 								
 							default:
 								this.setState (ST_TAG_X, CL_DEAFULT)
-								this.position = pos
+								this.xPosition = pos
 								break
 						
 						}
@@ -182,7 +191,7 @@ const XMLLexer = class extends Transform {
 				
 				case ST_TAG_X:
 				
-					for (let pos = this.position + 1; pos < body.length; pos ++) {
+					for (let pos = this.xPosition + 1; pos < body.length; pos ++) {
 
 						switch (body.charCodeAt (pos)) {
 						
@@ -196,7 +205,7 @@ const XMLLexer = class extends Transform {
 										
 								}
 								
-								this.position = pos
+								this.xPosition = pos
 								break
 
 							case CH_GT:
@@ -210,9 +219,6 @@ const XMLLexer = class extends Transform {
 					}
 					
 					return
-
-				default:
-					throw new Error ('Invalid state: ' + this.state)
 					
 			}
 
@@ -226,7 +232,11 @@ const XMLLexer = class extends Transform {
 
 		this.start = pos
 		
-		if (lexeme.length !== 0) this.push (lexeme)
+		if (lexeme.length === 0) return
+			
+		this.#position.scan (lexeme)
+
+		this.push (lexeme)
 
 	}
 
@@ -237,24 +247,16 @@ const XMLLexer = class extends Transform {
 		callback ()
 
 	}
-	
-	getPosition () {
-	
-		let {beforeBody, start} = this
 		
-		return beforeBody + BigInt (start)
-	
-	}
-	
 	checkMaxLength () {
 	
 		const {body, maxLength} = this, size = body.length - this.start; 
 		
 		if (size <= maxLength) return
 
-		const s = body.slice (0, size - 1), dump = JSON.stringify ([s])
+		this.#position.scan (body.slice (0, size - 1))
 
-		this.destroy (new Error (`The fragment ${dump} at position ${this.getPosition ()} exceeds maxLength=${maxLength}`))
+		this.destroy (new Error (this.position.format (['XML-00001', maxLength])))
 	
 	}
 	

package/lib/XMLMessages.js

@@ -0,0 +1,88 @@
+const util = require ('node:util')
+
+const VOCABULARY = new Map ([
+
+	['XML-00001', 'maxLength=%i exceeded'],
+	['XML-00002', 'Unbalanced end element'],
+	['XML-00003', 'Unmatched end element, </${%s}> expected'],
+
+	['XSD-00001', 'Unknown namespace: %s'],
+	['XSD-00002', 'The element %s is not found in %s'],
+
+	['XVC-00001', 'No nested elements allowed inside %s'],
+	['XVC-00002', 'is unexpected here; should be %s'],
+	['XVC-00003', 'Unknown attribute: %s'],
+	['XVC-00004', 'The attribute "%s" must have the value "%s", not "%s"'],
+	['XVC-00005', 'Missing required attribute: "%s"'],
+
+	['XVS-00001', `The value "%s" doesn't match the pattern %s`],
+	['XVS-00002', `The value "%s" doesn't match any of the patterns: %s`],
+	['XVS-00003', `The value '%s' is not in list: %s`],
+	['XVS-00004', `The value '%s' has the length %i, which exceeds the allowed maximum of %i`],
+	['XVS-00005', `The value '%s' has the length %i, which is less than the allowed minimum of %i`],
+	['XVS-00006', `The value '%s' has the length %i, must be exaclty %i`],
+	['XVS-00007', `The value '%s' is less than the least allowed '%s'`],
+	['XVS-00008', `The value '%s' is greater than the greatest allowed '%s'`],
+	['XVS-00009', `The value '%s' is less or equal than the threshold '%s'`],
+	['XVS-00010', `The value '%s' is greater or equal than the threshold '%s'`],
+	['XVS-00011', `No boolean value can be empty`],
+	['XVS-00012', `'%s' is not a boolean value`],
+	['XVS-00013', `No decimal value can be empty`],
+	['XVS-00014', `'%s' is not a valid decimal: '%s' can occur only at the beginning`],
+	['XVS-00015', `'%s' is not a valid decimal: 2nd period occured at position %i`],
+	['XVS-00016', `'%s' is not a valid decimal: '%s' occured at position %i`],
+	['XVS-00017', `'%s' is not a valid decimal: it has no digits at all`],
+	['XVS-00018', `'%s' has %i digits, only %i allowed`],
+	['XVS-00019', `'%s' has  %i digits after period, only %i allowed`],
+	['XVS-00020', `No floating point number can be empty`],
+	['XVS-00021', `'%s' is not a floating point number`],
+	['XVS-00022', `For a date value, the time part cannot be present, but '%s' contains it`],
+	['XVS-00023', `For a dateTime value, the time part is mandatory, missing from '%s'`],
+	['XVS-00024', `For a dateTimeStamp value, both time and timezone parts are mandatory, missing from '%s'`],
+	['XVS-00025', `The year separator is not found in '%s'`],
+	['XVS-00026', `'%s': '%s' is not a valid year, must be 4 chars long`],
+	['XVS-00027', `'%s': The character at %i must be '-', not '%s'`],
+	['XVS-00028', `'%s': The day part must be 2 chars long, found '%s'`],
+	['XVS-00029', `'%s': Invalid time part: the character at position %i must be ':', not '%s'`],
+	['XVS-00030', `'%s': '%s' is not a valid year: '%s' at position %i`],
+	['XVS-00031', `'%s': Invalid month '%s'`],
+	['XVS-00032', `'%s': Invalid day '%s'`],
+	['XVS-00033', `'%s': Non existing day`],
+	['XVS-00034', `'%s': Invalid hour '%s'`],
+	['XVS-00035', `'%s': Invalid minute '%s'`],
+	['XVS-00036', `'%s': Invalid second '%s'`],
+	['XVS-00037', `'%s': Invalid TZ hour '%s'`],
+	['XVS-00038', `'%s': Invalid TZ minute '%s'`],
+	['XVS-00039', `'%s': Unless 'Z', the timezone must start with either '+' or '-', not '%s'`],
+	['XVS-00040', `'%s': Invalid timezone length '%i'`],
+	['XVS-00041', `'%s': Invalid timezone: ':' not found at position 3`],
+
+])
+
+class XMLMessages {
+
+	static VOCABULARY = VOCABULARY
+
+	static format (args) {
+
+		const code = args [0]
+
+		args [0] = VOCABULARY.get (code)
+
+		return code + ' ' + util.format.apply (util, args)
+
+	}
+
+	static raise (args) {
+
+		const error = Error (XMLMessages.format (args))
+
+		error.args = args
+
+		throw error
+
+	}
+	
+}
+
+module.exports = XMLMessages

package/lib/XMLParser.js

@@ -48,6 +48,7 @@ const XMLParser = class {
 		this.text = ''
 		this.document = null
 		this.element = null
+		this.validationMessages = []
 
 		const {entityResolver} = this, nodes = new XMLIterator (src, {entityResolver})
 		
@@ -67,9 +68,7 @@ const XMLParser = class {
 
 					if (this.stripSpace) this.text = this.text.trim ()
 					if (this.text.length === 0) break
-					if (this.validator) {
-						this.validator.characters (this.text)
-					}
+					if (this.validator) {this.validator.characters (this.text)}
 					(new XMLNode (this.text, null, SAXEvent.TYPES.CHARACTERS)).parent = this.element
 					this.text = ''
 
@@ -84,20 +83,28 @@ const XMLParser = class {
 					this.element = node
 					if (this.document === null) {
 						this.document = node
-						if (this.xs !== null) this.validator = new XMLValidatior (this.xs, node, () => nodes.linePos)
+						if (this.xs !== null) {
+							try {
+								this.validator = new XMLValidatior (this.xs, node, nodes.position, message => this.validationMessages.push (message))
+							}
+							catch (err) {
+								this.validationMessages.push (nodes.position + err.message)
+							}							
+						}
 					}
 					else {
-						if (this.xs !== null) this.validator.startElement (node)
+						if (this.validator) this.validator.startElement (node)
 					}
 					break
 
 				case SAXEvent.TYPES.END_ELEMENT:
 
-					if (this.element === null) throw new Error (`Unbalanced end element tag "${node.src}" occured at position ${nodes.absolutePosition}`)
+					if (this.element === null)          throw new Error (nodes.position.format (['XML-00002']))
+					if (this.element.name != node.name) throw new Error (nodes.position.format (['XML-00003', this.element.name]))
 					node ['_ns_map'] = this.element ['_ns_map']
 					this.element.type = type
 					this.element = this.element.parent
-					if (this.xs !== null) this.validator.endElement (node)
+					if (this.validator) this.validator.endElement (node)
 					break
 
 			}

package/lib/XMLPosition.js

@@ -1,4 +1,10 @@
 const CH_LF = '\n'.charCodeAt (0)
+const CH_SPACE = ' '.charCodeAt (0)
+const MAX_LEN_TOTAL = 50
+const STR_ELLIPSIS  = '...'
+const MAX_LEN = MAX_LEN_TOTAL - STR_ELLIPSIS.length
+
+const XMLMessages = require ('./XMLMessages')
 
 class XMLPosition {
 
@@ -6,11 +12,13 @@ class XMLPosition {
 	#localPosition = 0
 	#lastLine = 0
 	#lastLocalPosition = 0
+	#chunk
 
 	scan (chunk) {
 
 		this.#lastLine = this.#line
 		this.#lastLocalPosition = this.#localPosition
+		this.#chunk = chunk
 
 		for (let i = 0; i < chunk.length; i ++) switch (chunk.charCodeAt (i)) {
 
@@ -26,11 +34,49 @@ class XMLPosition {
 
 	}
 
-	toJSON () {
+	get line () {
+
+		return this.#lastLine + 1
+
+	}
+
+	get position () {
+
+		return this.#lastLocalPosition + 1
+
+	}
+
+	get chunk () {
+
+		const {length} = this.#chunk; if (length <= MAX_LEN) return this.#chunk
+
+		return this.#chunk.substr (0, MAX_LEN) + STR_ELLIPSIS
+
+	}
+
+	get src () {
+
+		const b = Buffer.from (this.chunk)
+
+		for (let i = 0; i < b.length; i ++) if (b [i] < CH_SPACE) b [i] = CH_SPACE
+
+		return ' `' + b + '`'
+
+	}
+
+	toString () {
 
-    	return [this.#lastLine + 1, this.#lastLocalPosition + 1]
+		const {line, position, src} = this		
 
-	}	
+		return `[${line}:${position}]${src} `
+
+	}
+
+	format (args) {
+
+		return this.toString () + XMLMessages.format (args)
+
+	}
 	
 }
 

package/lib/XMLReader.js

@@ -3,7 +3,6 @@ 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')
@@ -13,8 +12,6 @@ const NO_CHILDREN = []; NO_CHILDREN.push = () => {}
 
 const XMLReader = class extends Transform {
 
-	#position = new XMLPosition ()
-
 	constructor (options = {}) {
 
 		options.decodeStrings = false
@@ -72,14 +69,10 @@ const XMLReader = class extends Transform {
 		this.filter        = filter || null
 		this.map           = map || null
 	
-		this.line = 0
-		this.localPosition = 0
-
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
 		
 		this.text = ''
 		this.element = null
-		this.position = 0
 		
 		this [OPT_SRC] = null; this.on ('pipe', src => this [OPT_SRC] = src)
 		
@@ -154,13 +147,20 @@ const XMLReader = class extends Transform {
 		if (!this.validator) switch (xmlNode.type) {
 
 			case SAXEvent.TYPES.START_ELEMENT:									
-				this.validator = new XMLValidatior (this.xs, xmlNode, () => this.linePos)
+				try {
+					this.validator = new XMLValidatior (this.xs, xmlNode, this.lex.position, s => this.emit ('validation-message', s))
+				}
+				catch (err) {
+					this.emit ('validation-message', this.lex.position + err.message)
+				}
 
 			default:
 				return
 
 		}
 
+		// if (!this.validator) return
+
 		switch (xmlNode.type) {
 
 			case SAXEvent.TYPES.START_ELEMENT : return this.validator.startElement (xmlNode)
@@ -177,17 +177,17 @@ const XMLReader = class extends Transform {
 
 		if (type !== null) xmlNode.type = type
 
-		if (this.xs) try {
+		if (this.xs) /*try {*/
 
 			this.validate (xmlNode)
-
+/*
 		}
 		catch (error) {
 
 			this.destroy (error)
 
 		}
-
+*/
 		const {filter} = this; if (filter !== null) {
 
 			if (!filter (xmlNode)) return
@@ -250,18 +250,10 @@ const XMLReader = class extends Transform {
 
 	}
 
-	get linePos () {
-
-		return this.#position.toJSON ()
-
-	}
-
 	_transform (chunk, encoding, callback) {
 
 		const {length} = chunk; if (length !== 0) {
 
-			this.#position.scan (chunk)
-
 			let e = new XMLNode (chunk, this.entityResolver), {type} = e, {element} = this
 
 			switch (type) {
@@ -284,10 +276,12 @@ const XMLReader = class extends Transform {
 			}
 
 			switch (type) {
-							
+
 				case SAXEvent.TYPES.END_ELEMENT:
 
-					if (element === null) return callback (new Error (`Unbalanced end element tag "${chunk}" occured at position ${this.position}`))
+					if (element === null)       return callback (new Error (this.lex.position.format (['XML-00002'])))
+
+					if (e.name != element.name) return callback (new Error (this.lex.position.format (['XML-00003', this.element.name])))
 
 					e = element
 
@@ -324,8 +318,6 @@ const XMLReader = class extends Transform {
 
 			}
 
-			this.position += length
-
 		}		
 
 		callback ()

package/lib/XMLSchema.js

@@ -1,3 +1,4 @@
+const XMLMessages = require ('./XMLMessages.js')
 const TYPES = Symbol ('_types')
 
 const FORM_U = 'unqualified'
@@ -91,7 +92,7 @@ const XMLSchema = class extends Map {
 
 		const el = this.get (localName)
 
-		if (!el || el.localName !== 'element') throw Error (`The element ${localName} is not found in ${this.targetNamespace}`)
+		if (!el || el.localName !== 'element') XMLMessages.raise (['XSD-00002', localName, this.targetNamespace])
 
 		return el
 

package/lib/XMLSchemata.js

@@ -7,6 +7,7 @@ const XMLSchema = require ('./XMLSchema.js')
 const XMLSchemaXml = require ('./XMLSchemaXml.js')
 const XMLSchemaBuiltIn = require ('./XMLSchemaBuiltIn.js')
 const XMLMarshaller = require ('./XMLMarshaller.js')
+const XMLMessages = require ('./XMLMessages.js')
 
 const XSAnyType = require ('./XSAnyType.js')
 const {XSSimpleType} = require ('./simple/XSSimpleType.js')
@@ -117,24 +118,19 @@ const XMLSchemata = class extends Map {
 
 				}
 
-				validateScalar (v) {
+				test (v) {
 
-					const messages = []; for (const node of this.nodes) {
+					let message = ''; for (const node of this.nodes) {
 
-						try {
+						const result = this.xs.getSimpleType (node).test (v); if (!result) return null
 
-							return this.xs.getSimpleType (node).validateScalar (v)
+						if (message.length !== 0) message += '; '
 
-						}
-						catch (err) {
-
-							messages.push (err.message)
-
-						}
+						message += XMLMessages.format (result)
 
 					}
 
-					throw Error (messages.join ('; '))
+					return message					
 
 				}
 
@@ -172,7 +168,7 @@ const XMLSchemata = class extends Map {
 
 	getSchema (namespaceURI) {
 
-		if (!this.has (namespaceURI)) throw new Error ('Unknown namespace: ' + namespaceURI)
+		if (!this.has (namespaceURI)) XMLMessages.raise (['XSD-00001', namespaceURI])
 
 		return this.get (namespaceURI)
 

package/lib/simple/DT7.js

@@ -15,28 +15,38 @@ class DT7 {
 
 		const t = typeof src; if (t !== 'string') throw Error (`The Seven-property Date Time Model can only be constructed from a string, not a(n) ${t}`)
 
-		const {length} = src; if (length < MIN_LENGTH) throw Error (`${length} chars found, at least ${MIN_LENGTH} required`)
-
 		this.src = src
 
+		const {length} = src; if (length < MIN_LENGTH) this.raise ('XVS-00005', length, MIN_LENGTH)
+
 		this.parse ()
 		this.validate ()
 
 	}
 
+	raise (code, ...args) {
+
+		const err = Error ('DT7 error')
+
+		err.payload = [code, this.src, ...args]
+
+		throw err
+
+	}
+
 	parse () {
 
 		this.posMonth = this.src.indexOf ('-', 1)
 
-		if (this.posMonth === -1) throw Error (`The year separator is not found`)
+		if (this.posMonth === -1) this.raise ('XVS-00025')
 
-		if (this.posMonth < 3) throw Error (`'${this.year}' is not a valid year: cannot be shorter than 4 characters`)
+		if (this.posMonth < 3) this.raise ('XVS-00026', this.year)
 
-		if (this.src.charCodeAt (this.posDay) !== CH_MINUS) throw Error (`The character at ${this.posDay} must be '-', not '${this.src.charAt (this.posDay)}'`)
+		if (this.src.charCodeAt (this.posDay) !== CH_MINUS) this.raise ('XVS-00027', this.posDay, this.src.charAt (this.posDay))
 		
 		const {length} = this.src
 
-		if (length < this.endOfDate) throw Error (`The day part must be 2 chars long, found '${this.day}'`)
+		if (length < this.endOfDate) this.raise ('XVS-00028', this.day)
 
 		if (length !== (this.endOfDateTime = this.endOfDate)) this.parseAfterDate ()
 
@@ -46,12 +56,8 @@ class DT7 {
 		
 		if (this.src.charCodeAt (this.endOfDate) !== CH_T) return
 
-		for (const pos of [this.endOfHour, this.endOfMinute])
-
-			if (this.src.charCodeAt (pos) !== CH_COLON)
+		for (const pos of [this.endOfHour, this.endOfMinute]) if (this.src.charCodeAt (pos) !== CH_COLON) this.raise ('XVS-00029', pos, this.src.charAt (pos))
 				
-				throw Error (`Invalid time part: the character at position ${pos} must be ':', not '${this.src.charAt (pos)}'`)
-
 		this.hasTime = true
 
 		this.parseAfterMinute ()	
@@ -164,13 +170,13 @@ class DT7 {
 
 		const {year} = this, {length} = year, base = year.charCodeAt (0) === CH_MINUS ? 1 : 0
 
-		if (year.charCodeAt (base) === CH_0 && length - base !== 4) throw Error (`Starting with 0, the year must have exactly 4 digits`)
+		if (year.charCodeAt (base) === CH_0 && length - base !== 4) this.raise ('XVS-00026', year)
 		
 		for (let i = base; i < length; i ++) {
 
 			const c = year.charCodeAt (i)
 
-			if (c > CH_9 || c < CH_0) throw Error (`Invalid year: '${year.charAt (i)} at position ${i}'`)
+			if (c > CH_9 || c < CH_0) this.raise ('XVS-00030', year, year.charAt (i), i)
 
 		}
 
@@ -180,7 +186,13 @@ class DT7 {
 
 		const {month} = this
 
-		if (month < '01' || month > '12') throw Error (`Invalid month`)
+		if (month < '01' || month > '12') this.raise ('XVS-00031', month)
+
+	}
+
+	validate2digits (value, code, max = '59', min = '00') {
+
+		if (value < min || value > max) this.raise (code, value)
 
 	}
 
@@ -188,11 +200,11 @@ class DT7 {
 
 		const {day} = this
 
-		if (day < '01' || day > '31') throw Error (`Invalid day`)
+		this.validate2digits (day, 'XVS-00032', '31', '01')
 
 		if (day === '31' || (this.month === '02' && day > '28')) {
 
-			if (new Date (this.src.substring (0, this.endOfDate)).getDate () != day) throw Error (`Non existing day`)
+			if (new Date (this.src.substring (0, this.endOfDate)).getDate () != day) this.raise ('XVS-00033')
 
 		}
 
@@ -200,14 +212,12 @@ class DT7 {
 
 	validateTime () {
 
-		const {hour, minute, second} = this
+		this.validate2digits (this.hour,   'XVS-00034', '23')
+		this.validate2digits (this.minute, 'XVS-00035')
 
-		if (hour      < '00'    || hour      > '23') throw Error (`Invalid hour`)
-		if (minute    < '00'    || minute    > '59') throw Error (`Invalid minute`)
+		const {second} = this, intSecond = second.length === 2 ? second : second.substring (0, 2)
 
-		const intSecond = second.length === 2 ? second : second.substring (0, 2)
-
-		if (intSecond < '00'    || intSecond > '59') throw Error (`Invalid second`)
+		this.validate2digits (intSecond,   'XVS-00036')
 
 	}
 
@@ -220,24 +230,15 @@ class DT7 {
 			case CH_MINUS:
 				break
 			default:
-				throw Error (`Unless 'Z', the timezone must start with either '+' or '-', not ${tz.charAt (0)}`)
+				this.raise ('XVS-00039', tz.charAt (0))
 		}
 
-		if (tz.length !== 6) throw Error (`Invalid timezone length: ${tz.length}`)
-
-		if (tz.charCodeAt (3) !== CH_COLON) throw Error (`Invalid timezone: ':' not found at position 3`)
-
-		{
+		if (tz.length !== 6) this.raise ('XVS-00040', tz.length)
 
-			const hh = tz.substring (1, 3); if (hh < '00' || hh > '13') throw Error (`Invalid TZ hour: ${hh}`)
+		if (tz.charCodeAt (3) !== CH_COLON) this.raise ('XVS-00041')
 
-		}
-
-		{
-
-			const mm = tz.substring (4, 6); if (mm < '00' || mm > '59') throw Error (`Invalid TZ minute: ${mm}`)
-
-		}
+		this.validate2digits (tz.substring (1, 3), 'XVS-00037', '13')
+		this.validate2digits (tz.substring (4, 6), 'XVS-00038')
 
 		tzCache.add (tz)
 

package/lib/simple/XSSimpleType.js

@@ -1,3 +1,5 @@
+const XMLMessages = require ('../XMLMessages')
+
 class XSSimpleType {
 
 	constructor (xs) {
@@ -51,7 +53,7 @@ class XSSimpleType {
 
 			const result = this.test (s); if (result === null) return s
 						
-			reasons.push (result)
+			reasons.push (XMLMessages.format (result))
 
 		}
 
@@ -95,30 +97,54 @@ class XSSimpleType {
 
 		let ordered = undefined
 
-		if (this.minInclusive != null && (ordered   = this.toOrdered (value)) <  this.minInclusive) throw Error (`The value '${value}' is less than allowed '${this.minInclusive}'`)
+		{
 
-		if (this.maxInclusive != null && (ordered ??= this.toOrdered (value)) >  this.maxInclusive) throw Error (`The value '${value}' is greater than allowed '${this.maxInclusive}'`)
+			const {minInclusive} = this; if (minInclusive != null && (ordered   = this.toOrdered (value)) <  minInclusive) return ['XVS-00007', value, minInclusive]
 			
-		if (this.minExclusive != null && (ordered ??= this.toOrdered (value)) <= this.minExclusive) throw Error (`The value '${value}' is less or equal than the threshold '${this.minExclusive}'`)
+		}
+
+		{
+
+			const {maxInclusive} = this; if (maxInclusive != null && (ordered ??= this.toOrdered (value)) > maxInclusive) return ['XVS-00008', value, maxInclusive]
+			
+		}
+
+		{
 
-		if (this.maxExclusive != null && (ordered ??= this.toOrdered (value)) >= this.maxExclusive) throw Error (`The value '${value}' is greater or equal than the threshold '${this.maxExclusive}'`)
+			const {minExclusive} = this; if (minExclusive != null && (ordered ??= this.toOrdered (value)) <= minExclusive) return ['XVS-00009', value, minExclusive]
+			
+		}
+
+		{
+
+			const {maxExclusive} = this; if (maxExclusive != null && (ordered ??= this.toOrdered (value)) >= maxExclusive) return ['XVS-00010', value, maxExclusive]
+			
+		}
 
 	}
 
 	testLength (value) {
 
-		const l = this.getLength (value), {length} = this
+		const l = this.getLength (value), {length, units} = this
 
 		if (length === null) {
 
-			if (l > this.maxLength) return `The value '${value}' is ${l} ${this.units} long, which exceeds the allowed maximum of ${this.maxLength}`
+			{
 
-			if (l < this.minLength) return `The value '${value}' is ${l} ${this.units} long, which is less than the allowed minimum of ${this.minLength}`
+				const {maxLength} = this; if (l > maxLength) return ['XVS-00004', value, l, maxLength]
+
+			}
+
+			{
+
+				const {minLength} = this; if (l < minLength) return ['XVS-00005', value, l, minLength]
+
+			}
 
 		}
 		else {
 
-			if (l !== length) return `The value '${value}' is ${l} ${this.units} long, must be exaclty ${length}`
+			if (l !== length) return ['XVS-00006', value, l, length]
 
 		}
 
@@ -136,7 +162,7 @@ class XSSimpleType {
 
 		const {values} = this; if (values.includes (s)) return null
 
-		return `The value '${s}' is not in list: ${JSON.stringify (values)}`
+		return ['XVS-00003', JSON.stringify (values)]
 
 	}
 
@@ -146,17 +172,7 @@ class XSSimpleType {
 
 		for (const pattern of patterns) if (pattern.test (s)) return null
 
-		if (length === 1) return `The value '${s}' doesn't match the pattern '${patterns [0]}'`
-
-		return `The value '${s}' doesn't match any of the patterns: ${patterns.map (_ => '' + _).join (', ')}`
-
-	}
-
-	validateScalar (s) {
-
-		const result = this.test (s ?? '')
-
-		if (result) throw Error (result)			
+		return [length === 1 ? 'XVS-00001' : 'XVS-00002', s, patterns.join (', ')]
 
 	}
 

package/lib/simple/XSSimpleTypeBoolean.js

@@ -57,13 +57,13 @@ class XSSimpleTypeBoolean extends XSSimpleType {
 
 	testLength (value) {
 
-		return value.length === 0 ? 'No boolean value can be empty' : null
+		return value.length === 0 ? ['XVS-00011'] : null		
 
 	}
 
 	testFormat (value) {
 
-		if (this.toOrdered (value) === undefined) return `'${value}' is not a boolean value`
+		if (this.toOrdered (value) === undefined) return ['XVS-00012', value]
 
 		return null
 

package/lib/simple/XSSimpleTypeDT.js

@@ -33,9 +33,20 @@ class XSSimpleTypeDate extends XSSimpleTypeDT {
 
 	testFormat (s) {
 
-		const dt7 = new DT7 (s)
+		try {
 
-		if (dt7.hour !== undefined) return `For a date value, the time part cannot be present`
+			const dt7 = new DT7 (s)
+
+			if (dt7.hour !== undefined) return ['XVS-00022', s]
+			
+		}
+		catch (err) {
+
+			if ('payload' in err) return err.payload
+
+			throw err
+
+		}
 
 	}
 
@@ -53,9 +64,20 @@ class XSSimpleTypeDateTime extends XSSimpleTypeDT {
 
 	testFormat (s) {
 
-		const dt7 = new DT7 (s)
+		try {
+
+			const dt7 = new DT7 (s)
+
+			if (dt7.hour === undefined) return ['XVS-00023', s]
+			
+		}
+		catch (err) {
+
+			if ('payload' in err) return err.payload
 
-		if (dt7.hour === undefined) return `For a dateTime value, the time part is mandatory`
+			throw err
+
+		}
 
 	}
 
@@ -75,9 +97,20 @@ class XSSimpleTypeDateTimeStamp extends XSSimpleTypeDateTime {
 
 	testFormat (s) {
 
-		const dt7 = new DT7 (s)
+		try {
+
+			const dt7 = new DT7 (s)
 
-		if (dt7.hour === undefined || dt7.tz === undefined) return `For a dateTimeStamp value, both time and timezone parts are mandatory`
+			if (dt7.hour === undefined || dt7.tz === undefined) return ['XVS-00024', s]
+
+		}
+		catch (err) {
+
+			if ('payload' in err) return err.payload
+
+			throw err
+
+		}
 
 	}
 

package/lib/simple/XSSimpleTypeDecimal.js

@@ -53,7 +53,7 @@ class XSSimpleTypeDecimal extends XSSimpleType {
 
 	testLength (value) {
 
-		return value.length === 0 ? 'No decimal value can be empty' : null
+		return value.length === 0 ? ['XVS-00013'] : null
 
 	}
 
@@ -67,16 +67,16 @@ class XSSimpleTypeDecimal extends XSSimpleType {
 
 				case CH_PLUS:
 				case CH_MINUS:
-					if (i !== 0) return `'${value}' is not a valid decimal: '${value.charAt (i)}' can occur only at the beginning`
+					if (i !== 0) return ['XVS-00014', value, value.charAt (i)]
 					continue
 
 				case CH_PERIOD:
-					if (period !== -1) return `'${value}' is not a valid decimal: 2nd period occured at position ${i}`
+					if (period !== -1) return ['XVS-00015', value, i]
 					period = i
 					continue
 
 				default:
-					if (c < CH_0 || c > CH_9) return `'${value}' is not a valid decimal: '${value.charAt (i)}' occured at position ${i}`
+					if (c < CH_0 || c > CH_9) return ['XVS-00016', value, value.charAt (i), i]
 					total ++
 					if (period !== -1) fraction ++
 
@@ -84,13 +84,19 @@ class XSSimpleTypeDecimal extends XSSimpleType {
 
 		}
 		
-		if (total === 0) return `'${value}' is not a valid decimal: is has no digits at all`
+		if (total === 0) return ['XVS-00017', value]
 
-		const {totalDigits, fractionDigits} = this
+		{
 
-		if (total > totalDigits) return `'${value}' has ${total} digits, only ${totalDigits} allowed`
+			const {totalDigits} = this; if (total > totalDigits) return ['XVS-00018', value, total, totalDigits]
 
-		if (fraction > fractionDigits) return `'${value}' has ${fraction} digits after period, only ${fractionDigits} allowed`
+		}
+
+		{
+
+			const {fractionDigits} = this; if (fraction > fractionDigits) return ['XVS-00019', value, fraction, fractionDigits]
+
+		}
 
 		return null
 

package/lib/simple/XSSimpleTypeFloatingPoint.js

@@ -32,13 +32,13 @@ class XSSimpleTypeFloatingPoint extends XSSimpleType {
 
 	testLength (value) {
 
-		return value.length === 0 ? 'No floating point number can be empty' : null
+		return value.length === 0 ? ['XVS-00020'] : null
 
 	}
 
 	testFormat (value) {
 
-		if (Number.isNaN (this.toOrdered (value)) && value !== 'NaN') return `'${value}' is not a floating point number`
+		if (Number.isNaN (this.toOrdered (value)) && value !== 'NaN') return ['XVS-00021', value]
 
 		return null
 

package/lib/validation/XMLValidationState.js

@@ -1,4 +1,5 @@
 const {XSINamespace} = require ('../NamespacesMap')
+const XMLMessages = require ('../XMLMessages')
 
 class XMLValidationState {
 
@@ -7,33 +8,10 @@ class XMLValidationState {
 
 	constructor (parent, parsedNode, elementDefinition) {
 
-		this.xs = (this.parent = parent).xs
+		const xs = this.xs = (this.parent = parent).xs
 		this.parsedNode = parsedNode
-		
-		try {
 
-			this.setTypeFrom (elementDefinition)
-
-		}
-		catch (cause) {
-
-			throw Error (`Validation problem with ${this.formatPosition (parsedNode)}: ${cause.message}`, {cause})
-
-		}
-
-	}
-
-	get getPosition () {
-		
-		return this.parent.getPosition 
-	
-	}
-
-	setTypeFrom (element) {
-
-		const {xs} = this
-
-		const typeDefinition = xs.getTypeDefinition (element)
+		const typeDefinition = xs.getTypeDefinition (elementDefinition)
 
 		this.anyType = xs.getAnyType (typeDefinition)
 
@@ -43,25 +21,23 @@ class XMLValidationState {
 
 	}
 
-	blameNothingExpected () {
+	warn (message, cause) {
 
-		throw Error (`No nested elements allowed inside ${this.parsedNode.src}`)
+		return this.parent.warn (message, cause)
 
 	}
 
-	formatPosition ({src}) {
-
-		const [line, char] = this.getPosition ()
+	blameNothingExpected () {
 
-		return `${src} at line ${line}, position ${char}`
+		return this.warn (['XVC-00001', this.parsedNode.src])
 
 	}
 
 	blameUnexpectedTag (parsedNode, match) {
 
-		const expected = match.allExpected (parsedNode); if (expected == null) this.blameNothingExpected ()
+		const expected = match.allExpected (parsedNode); if (expected == null) return this.blameNothingExpected ()
 
-		throw Error (`Unexpected ${this.formatPosition (parsedNode)}, expected: ${expected}`)
+		return this.warn (['XVC-00002', expected])
 
 	}
 
@@ -69,9 +45,9 @@ class XMLValidationState {
 
 		if (this.#child !== null) return this.#child.startElement (parsedNode)
 
-		const {match} = this; if (!match) throw Error (`No nested elements allowed inside ${this.anyType.debugQName}`)
+		const {match} = this; if (!match) return this.warn (['XVC-00001', this.anyType.debugQName])
 
-		const element = match.getElementDefinition (parsedNode); if (!element) this.blameUnexpectedTag (parsedNode, match)
+		const element = match.getElementDefinition (parsedNode); if (!element) return this.blameUnexpectedTag (parsedNode, match)
 
 		if (element.localName === 'any') return
 
@@ -85,7 +61,7 @@ class XMLValidationState {
 
 			if (!this.#hadText) this.characters ('')
 
-			const {match} = this; if (match && !match.isSatisfied) this.blameUnexpectedTag (parsedNode, match)
+			const {match} = this; if (match && !match.isSatisfied) return this.blameUnexpectedTag (parsedNode, match)
 			
 			return null
 
@@ -103,16 +79,15 @@ class XMLValidationState {
 
 		this.#hadText = true
 
-		try {
+		this.validateScalar (text, this.anyType.asSimpleType ())
 
-			this.anyType.asSimpleType ().validateScalar (text)
+	}
 
-		}
-		catch (cause) {
+	validateScalar (value, type) {
 
-			throw Error (`Validation problem with the contents of ${this.formatPosition (this.parsedNode)}: ${cause.message}`, {cause})
+		const result = type.test (value ?? '')
 
-		}
+		if (result) this.warn (result)
 
 	}
 
@@ -154,7 +129,7 @@ class XMLValidationState {
 
 				if (attributesMap.getNamespaceURI (name) === XSINamespace) continue
 
-				throw Error (`Unknown attribute: "${name}"`)
+				return this.warn (['XVC-00003', name])
 
 			}
 
@@ -162,31 +137,18 @@ class XMLValidationState {
 
 			const {attributes: {fixed, type}} = def
 
-			if (typeof fixed === 'string' && value !== fixed) throw Error (`The attribute "${name}" must have the value "${fixed}", not "${value}"`)
-
-			const validateBy = typeNode => {
-
-				try {
-
-					this.xs.getSimpleType (typeNode).validateScalar (value)
-
-				}
-				catch (cause) {
-
-					throw Error (`attribute '${name}": ${cause.message}`, {cause})
-
-				}
-
-			}
+			if (typeof fixed === 'string' && value !== fixed) return this.warn (['XVC-00004', name, fixed, value])
 
 			if (type) {
 
-				validateBy (this.xs.getType (type))
+				this.validateScalar (value, this.xs.getSimpleType (this.xs.getType (type)))
 
 			}
 			else {
 
-				for (const node of def.children) validateBy (node)
+				for (const node of def.children)
+
+					this.validateScalar (value, this.xs.getSimpleType (node))
 
 			}
 
@@ -194,7 +156,7 @@ class XMLValidationState {
 
 		for (const [name, def] of attributes) if (!matched.has (def)) {
 
-			if (def.attributes.use === 'required') throw Error (`Missing required attribute: "${name}"`)
+			if (def.attributes.use === 'required') return this.warn (['XVC-00005', name])
 
 			if ('default' in def.attributes) attributesMap.set (name, def.attributes.default)
 

package/lib/validation/XMLValidatior.js

@@ -4,12 +4,27 @@ class XMLValidatior {
 
 	#state = null
 
-	constructor (xs, rootNode, getPosition) {
+	constructor (xs, rootNode, position, onMessage) {
 
 		this.xs = xs
-		this.getPosition = getPosition
+		this.position = position
 
-		this.startElement (rootNode)
+		this.onMessage = onMessage
+		this.startElement (rootNode)		
+
+	}
+
+	warn (message) {
+
+		const {position} = this
+
+		if (Array.isArray (message)) message = position.format (message)
+
+		this.onMessage (message)
+
+		return null
+
+		// throw Error (message)
 
 	}
 

package/package.json

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