xml-toolkit 1.0.43 → 1.0.45

package/lib/XMLLexer.js

@@ -14,11 +14,10 @@ const CH_MINUS       = '-'.charCodeAt (0)
 const CH_SQUARE      = '['.charCodeAt (0)
 const CH_GT          = '>'.charCodeAt (0)
 
-const CL_DEAFULT = Buffer.from ('')
-const CL_PI      = Buffer.from ('?',  'ascii')
-const CL_COMMENT = Buffer.from ('--', 'ascii')
-const CL_SQ_1    = Buffer.from (']',  'ascii')
-const CL_SQ_2    = Buffer.from (']]', 'ascii')
+const CL_DEAFULT = ''
+const CL_PI      = '?'
+const CL_COMMENT = '--'
+const CL_SQ_1    = ']'
 
 const S_ENCODING = Symbol ('encoding')
 
@@ -54,13 +53,11 @@ const XMLLexer = class extends Transform {
 
 	isClosing (pos) {
 
-		const {awaited} = this, {length} = awaited; if (length === 0) return true
+		const {awaited, body} = this, {length} = awaited; if (length === 0) return true
 
-		let from = pos - length; if (from < this.start) return false
+		const from = pos - length; if (from < this.start) return false
 
-		if (this.body.charCodeAt (from) !== awaited [0]) return false
-
-		if (length === 2 && this.body.charCodeAt (from + 1) !== awaited [1]) return false
+		for (let i = 0; i < length; i ++) if (body.charCodeAt (from + i) !== awaited.charCodeAt (i)) return false
 		
 		return true
 	
@@ -114,7 +111,7 @@ const XMLLexer = class extends Transform {
 
 						}
 
-					}
+					} 
 									
 					break
 					
@@ -149,7 +146,7 @@ const XMLLexer = class extends Transform {
 					{
 
 						const pos = start + 2; if (pos >= body.length) return null
-						
+
 						switch (body.charCodeAt (pos)) {
 						
 							case CH_MINUS:
@@ -186,7 +183,7 @@ const XMLLexer = class extends Transform {
 				case ST_TAG_X:
 				
 					for (let pos = this.position + 1; pos < body.length; pos ++) {
-					
+
 						switch (body.charCodeAt (pos)) {
 						
 							case CH_SQUARE:
@@ -197,10 +194,6 @@ const XMLLexer = class extends Transform {
 										this.awaited = CL_SQ_1
 										break
 										
-									case CL_SQ_1:
-										this.awaited = CL_SQ_2
-										break
-
 								}
 								
 								this.position = pos
@@ -249,7 +242,7 @@ const XMLLexer = class extends Transform {
 	
 		let {beforeBody, start} = this
 		
-		return start === 0 ? beforeBody : beforeBody + BigInt (start)
+		return beforeBody + BigInt (start)
 	
 	}
 	
@@ -265,7 +258,7 @@ const XMLLexer = class extends Transform {
 	
 	}
 	
-	_transform (chunk, encoding, callback) {
+	_transform (chunk, _, callback) {
 	
 		if (Buffer.isBuffer (chunk)) chunk = this.decoder.write (chunk)
 

package/lib/XMLMarshaller.js

@@ -1,56 +1,10 @@
 const assert       = require ('assert')
-const stringEscape = require ('string-escape-map')
 const NamespacePrefixesMap = require ('./NamespacePrefixesMap.js')
-
-let esc = [
-  ['<', '&lt;'],
-  ['>', '&gt;'],
-  ['&', '&amp;'],
-  ['"', '&quot;']
-]
-
-//const XML_BODY = new stringEscape (esc)
-
-//esc.push (['"', '&quot;'])
-
-const XML_ATTR = new stringEscape (esc)
-
-const BOOL = new Map ([
-	['0',     'false'],
-	['false', 'false'],
-	['N',     'false'],
-	['1',     'true'],
-	['true',  'true'],
-	['Y',     'true'],
-])
-
-const XML_DECL = [
-	['version', '1.0'], 
-	['encoding', null], 
-	['standalone', null]
-]
-
-const _declaration = o => {
-
-	if (typeof o !== 'object' || o === null) return ''
-
-	let s = '<?xml'
-
-	for (const [name, def] of XML_DECL) {
-	
-		const f = name in o; if (!f && def === null) continue
-	
-		s += ' ' + name + '="' + (f ? o [name] : def) + '"'
-
-	}
-
-	return s + '?>'
-
-}
+const XMLPrinter = require ('./XMLPrinter.js')
 
 const XMLMarshaller = class {
 
-	constructor (xs, localName, namespaceURI) {
+	constructor (xs, localName, namespaceURI, printerOptions = {}) {
 	
 		this.xs = xs
 		
@@ -62,25 +16,29 @@ const XMLMarshaller = class {
 		
 		this.isNsDumped = false
 		
-		this.qNames = []
+		this.printer = new XMLPrinter (printerOptions)
 
 	}
 	
 	stringify (data, o = {}) {
 	
-		const {schemaElement} = this, {targetNamespace, attributes, children} = schemaElement
+		const {schemaElement, printer} = this, {targetNamespace, attributes} = schemaElement
 
 		if (typeof o === 'string') o = {localName: o}
 
-		this.buf = 'declaration' in o ? _declaration (o.declaration) : ''
+		{
+			
+			const {declaration} = o
 
-		this.appendElement (schemaElement, data, this.ns.QName (o.localName || attributes.name, targetNamespace))
+			if (declaration) printer.decl = declaration
 
-		let xml = this.buf
+		}
 
-		delete this.buf
+		printer.reset ()
 
-		return xml
+		this.appendElement (schemaElement, data, this.ns.QName (o.localName || attributes.name, targetNamespace))
+
+		return printer.text
 
 	}	
 	
@@ -90,68 +48,41 @@ const XMLMarshaller = class {
 		
 		this.appendElementBody (node, data)
 		
-		this.appendEndTag ()
+		this.printer.closeElement ()
 
 	}
 	
 	appendStartTag (node, data, qName) {
-	
-		this.qNames.push (qName)
-	
-		this.buf += '<' + qName
-		
+
+		this.printer.openElement (qName)
+
 		if (!this.isNsDumped) {
 		
-			this.buf += this.ns
+			this.printer.text += this.ns
 		
 			this.isNsDumped = true
 
 		}
 		
-		const {type} = node.attributes; if (type) this.appendAttributes (this.xs.getType (type), data)
-
 		this.appendAttributes (node, data)
 
-		this.buf += '>'
-
-	}
-
-	appendEndTag () {
-
-		this.buf += '</' + this.qNames.pop () + '>'
-
 	}
 
 	appendNullElement (node) {
 	
 		const {attributes: {name, nillable}, targetNamespace} = node
 	
-		if (BOOL.get (nillable) !== 'true') return
+		if (nillable !== 'true' && nillable !== '1') return
 		
 		const qName = this.ns.QName (name, targetNamespace)
 
-		this.buf += `<${qName} xsi:nil="true" />`
+		this.printer
+			.openElement (qName)
+				.writeAttribute ('xsi:nil', 'true')
+			.closeElement ()
 
 	}
 
-	appendScalar (node, data, restriction = {}) {
-		
-		for (const {localName, attributes, children} of node.children) {
-		
-			if (localName === 'restriction') {
-			
-				for (const {localName, attributes: {value}} of children) restriction [localName] = value
-			
-				return this.appendScalar (this.xs.getType (attributes.base), data, restriction)
-				
-			}
-			
-		}
-
-		this.buf += this.to_string (data, node.attributes.name, restriction)
-
-	}
-	
 	appendElementBody (node, data) {
 
 		const {attributes: {type}, children} = node
@@ -164,65 +95,33 @@ const XMLMarshaller = class {
 
 	appendAttributes (node, data) {
 
-		const {localName, namespaceURI, attributes, children, targetNamespace} = node, {name, type, ref} = attributes
+		const {localName, attributes, children, targetNamespace} = node, {name, ref} = attributes
 
 		if (ref) return this.appendAttributes (this.xs.getByReference (ref), data)
+
+		const {type} = node.attributes; if (type) this.appendAttributes (this.xs.getType (type), data)
 	
 		switch (localName) {
-
-			case 'anyAttribute':
-
-				if (data == null || typeof data !== 'object') return
-
-				if (null in data) 
-				
-					for (const o of Object.values (data [null])) 
-					
-						for (const [k, v] of Object.entries (o)) 
-						
-							this.buf += ' ' + k + '="' + XML_ATTR.escape ('' + v) + '"'
-
-				break
 			
-			case 'attribute':
-
-				if (data == null || typeof data !== 'object') return
-
-				if (!(name in data)) return
-
-				let v = data [name]; if (v == null) return 
-				
-				this.buf += ' ' + this.ns.QName (name, targetNamespace) + '="'
-
-				if (type) {
-
-					this.appendScalar (this.xs.getType (type), v)
-
-				}
-				else {
-
-					for (const child of node.children) if (child.localName === 'simpleType') this.appendScalar (child, v)
-							
-				}
-
-				this.buf += '"'
-				
-				break
-				
-			case 'any':
 			case 'sequence':
 			case 'choice':
 			case 'group':
-			case 'simpleType':
-			
+			case 'simpleType':		
 				return
 
-			case 'extension':
-			
+			case 'attribute':
+
+				const v = data [name]; if (v == null) return
+
+				return this.printer.writeAttribute (
+					this.ns.QName (name, targetNamespace), 
+					this.xs.getAttributeSimpleType (node).stringify (v)
+				)
+
+			case 'extension':		
 				this.appendAttributes (this.xs.getType (attributes.base), data)
 
 			default:
-
 				for (const i of children) this.appendAttributes (i, data)
 				
 		}
@@ -231,7 +130,7 @@ const XMLMarshaller = class {
 	
 	appendContent (node, data) {
 
-		const {localName, namespaceURI, attributes, children, targetNamespace} = node, {name, type, ref} = attributes
+		const {localName, attributes, children, targetNamespace} = node, {name, ref} = attributes
 		
 		if (localName === 'attribute') return
 
@@ -241,16 +140,20 @@ const XMLMarshaller = class {
 
 			case 'any':
 			
-				if (null in data) for (const xml in data [null]) this.buf += xml
+				if (null in data) for (const xml in data [null]) this.printer.writeBody (xml)
 				
 				return
 
 			case 'simpleType':
 
-				if (data !== null && typeof data === 'object' && !(data instanceof Date) && node.attributes.name !== 'QName') data = data [null]
+				if (typeof data === 'object' && data.hasOwnProperty (null)) data = data [null]
+
+				const type = this.xs.getSimpleType (node)
 
-				if (data != null) this.appendScalar (node, data)
+				const xml = type.stringify (data)
 				
+				this.printer.writeCharacters (xml)
+
 				return
 			
 			case 'element':
@@ -278,108 +181,7 @@ const XMLMarshaller = class {
 		}
 
 	}
-	
-	to_string (v, type, restriction = {}) {
-
-		const carp = () => {throw new Error (`Invalid value for ${type} type: ${v} (${typeof v})`)}
-
-		switch (type) {
 		
-			case 'boolean':
-				if (BOOL.has (v)) return BOOL.get (v)
-				return !v ? 'false' : 'true'
-
-			case 'date':
-				switch (typeof v) {
-					case 'string':
-						if (v.length === 10) return v
-					case 'number':
-					case 'bigint':
-						const d = new Date (v)
-						if (isNaN (d)) carp ()
-						v = d
-				}
-				if (v instanceof Date) {
-					return v.toJSON ().slice (0, 10)
-				}
-				else {
-					carp ()
-				}
-				
-			case 'dateTime':
-				switch (typeof v) {
-					case 'string':
-						if (v.length === 10) return v + 'T00:00:00'
-						return v
-					case 'number':
-					case 'bigint':
-						v = new Date (v)
-				}
-				if (v instanceof Date) {
-					return v.toJSON ()
-				}
-				else {
-					carp ()
-				}
-
-			case 'integer':
-			case 'nonNegativeInteger':
-			case 'positiveInteger':
-			case 'nonPositiveInteger':
-			case 'negativeInteger':
-			case 'long':
-				if (typeof v === 'string') v = BigInt (v)
-				switch (typeof v) {
-					case 'number':
-					case 'bigint':
-						return '' + v
-				}
-				carp ()
-
-			case 'int':
-			case 'short':
-			case 'byte':
-			case 'unsignedLong':
-			case 'unsignedInt':
-			case 'unsignedShort':
-			case 'unsignedByte':
-				if (typeof v === 'string') v = parseInt (v)
-				switch (typeof v) {
-					case 'number':
-						if (!Number.isInteger (v)) carp ()
-					case 'bigint':
-						return '' + v
-				}
-				carp ()
-
-			case 'float':
-			case 'double':
-				if (typeof v === 'string') v = parseFloat (v)
-				if (typeof v === 'number') switch (v) {
-					case Number.POSITIVE_INFINITY: return 'INF'
-					case Number.NEGATIVE_INFINITY: return '-INF'
-					default: return '' + v
-				}
-				carp ()
-
-			case 'decimal':
-				const {fractionDigits} = restriction
-				if (typeof v === 'string') v = parseFloat (v)
-				if (typeof v === 'number') return fractionDigits ? v.toFixed (fractionDigits.value) : '' + v
-				carp ()
-
-			case 'QName':
-				if (typeof v === 'object' && 'localName' in v) v = this.ns.QName (v.localName, v.namespaceURI)
-
-			default:
-				return XML_ATTR.escape ('' + v)
-			
-		}
-	
-	}
-	
 }
 
-XMLMarshaller.declaration = _declaration
-
 module.exports = XMLMarshaller

package/lib/XMLNode.js

@@ -1,33 +1,16 @@
-const os = require ('os')
 const SAXEvent      = require ('./SAXEvent.js')
 const XMLPrinter    = require ('./XMLPrinter.js')
-const AttributesMap = require ('./AttributesMap')
 const NamespacesMap = require ('./NamespacesMap')
 const MoxyLikeJsonEncoder = require ('./MoxyLikeJsonEncoder')
 
-const ENTITY_RESOLVER = Symbol ('_entityResolver')
-const ATTRIBUTES = Symbol ('_attributes')
+const ENTITY_RESOLVER = '_entityResolver'
+const ATTRIBUTES = '_attributes'
 const TYPE       = Symbol ('_type')
 const PARENT     = Symbol ('_parent')
 const LEVEL      = Symbol ('_level')
-const NS_MAP     = Symbol ('_ns_map')
+const NS_MAP     = '_ns_map'
 
-const stringEscape = require ('string-escape-map')
-
-const ESC = [
-  ['<', '&lt;'],
-  ['>', '&gt;'],
-  ['&', '&amp;'],  
-  [String.fromCharCode (10), '&#xA;'],
-  [String.fromCharCode (13), '&#xD;'],
-]
-
-const ESC_BODY = new stringEscape (ESC)
-const ESC_ATTR = new stringEscape ([...ESC,	['"', '&quot;']])
-
-const m2o = 
-	Object.fromEntries ? m => Object.fromEntries (m.entries ()) :
-	m => {let o = {}; for (const [k, v] of m.entries ()) o [k] = v; return o}
+const m2o = m => Object.fromEntries (m.entries ())
 
 const XMLNode = class extends SAXEvent {
 
@@ -41,7 +24,7 @@ const XMLNode = class extends SAXEvent {
 		this [PARENT]     = null
 		this [LEVEL]      = 0
 		
-		this.children     = null
+		this.children     = []
 
 	}
 
@@ -77,6 +60,20 @@ const XMLNode = class extends SAXEvent {
 	
 	}
 
+	get xml () {
+	
+		switch (this.type) {
+		
+			case SAXEvent.TYPES.END_DOCUMENT: return ''
+		
+			case SAXEvent.TYPES.END_ELEMENT: return this.isSelfEnclosed ? '' : `</${this.name}>`
+			
+			default: return this.src
+		
+		}
+	
+	}
+
 	readNamespaces () {
 
 		this [NS_MAP] = new NamespacesMap (this) 
@@ -93,7 +90,7 @@ const XMLNode = class extends SAXEvent {
 
 		this [LEVEL] = 1 + _parent.level
 
-		const {children} = _parent; if (children !== null) children.push (this)
+		const {children} = _parent; children.push (this)
 
 	}
 
@@ -122,25 +119,7 @@ const XMLNode = class extends SAXEvent {
 		return namespacesMap.getNamespaceURI (this.name, true)
 
 	}
-	
-	readAttributes () {
-
-		const m = new AttributesMap (this [ENTITY_RESOLVER], this [NS_MAP])
 		
-		this.writeAttributesToMap (m)
-		
-		this [ATTRIBUTES] = m
-
-	}
-
-	get attributes () {
-	
-		if (!(ATTRIBUTES in this)) this.readAttributes ()
-
-		return this [ATTRIBUTES]
-	
-	}
-	
 	toString (options, level = 0) {
 
 		if (arguments.length === 0) return this.toSourceString ()
@@ -181,32 +160,39 @@ const XMLNode = class extends SAXEvent {
 
 	}
 
-	detach_children (list, o = {}) {
-	
+	detachChildren (list) {
+
 		if (!Array.isArray (list) || list.length === 0) return []
 
-		let last = null, a = []; for (const i of list) {
-		
+		const a = []; for (const i of list) {
+
 			const d = i.detach (); if (d === null) continue
-			
-			if (d instanceof String && last instanceof String) {
 
-				last += d
+			if (typeof d === 'string') {
+
+				let {length} = a; if (length !== 0) {
+
+					length --; if (typeof a [length] === 'string') {
+
+						a [length] += d
+
+						continue
+
+					}
+
+				}
 
 			}
-			else {
 
-				a.push (last = d)
+			a.push (d)
 
-			}					
-		
 		}
-		
+
 		return a
 
 	}
 	
-	detach (o = {}) {
+	detach () {
 	
 		switch (this.type) {
 		
@@ -222,11 +208,9 @@ const XMLNode = class extends SAXEvent {
 					localName,
 					namespaceURI,
 					attributes    : m2o (attributes),
-					children      : this.detach_children (children, o),
+					children      : this.detachChildren (children),
 				}
 
-				if (o.nsMap) r.namespacesMap = m2o (namespacesMap || [])
-
 				return r
 				
 			default:

package/lib/XMLParser.js

@@ -3,7 +3,7 @@ const SAXEvent    = require ('./SAXEvent.js')
 const XMLNode     = require ('./XMLNode.js')
 const XMLIterator = require ('./XMLIterator.js')
 
-const XMLReader = class {
+const XMLParser = class {
 
 	constructor (options = {}) {
 		
@@ -21,7 +21,6 @@ const XMLReader = class {
 		this.useNamespaces = options.useNamespaces
 
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
-		
 
 	}
 	
@@ -83,4 +82,4 @@ const XMLReader = class {
 
 }
 
-module.exports = XMLReader
+module.exports = XMLParser

package/lib/XMLPrinter.js

@@ -156,10 +156,16 @@ const XMLPrinter = class {
 
 	writeCharacters (value) {
 
-		if (this.stack.length === 0) throw Error ('No element started yet')
-
 		if (typeof value !== 'string') throw Error ('The text content must be a string, not ' + (typeof value))
 
+		return this.writeBody (this.ESC_BODY.escape (value))
+
+	}
+
+	writeBody (value) {
+
+		if (this.stack.length === 0) throw Error ('No element started yet')
+
 		if (value.length === 0) return this
 
 		if (this.isOpening) {
@@ -168,7 +174,7 @@ const XMLPrinter = class {
 			this.isOpening = false
 		}
 
-		this.text += this.ESC_BODY.escape (value)
+		this.text += value
 
 		return this