xml-toolkit 0.0.3 → 0.0.7

package/index.js

@@ -1,6 +1,7 @@
-const XMLLexer        = require ('./lib/XMLLexer')
-const SAXEventEmitter = require ('./lib/SAXEventEmitter')
-const SAXEvent        = require ('./lib/SAXEvent')
-const AttributesMap   = require ('./lib/AttributesMap')
+const XMLLexer            = require ('./lib/XMLLexer')
+const XMLReader           = require ('./lib/XMLReader')
+const SAXEvent            = require ('./lib/SAXEvent')
+const AttributesMap       = require ('./lib/AttributesMap')
+const MoxyLikeJsonEncoder = require ('./lib/MoxyLikeJsonEncoder')
 
-module.exports = {SAXEventEmitter, XMLLexer, SAXEvent, AttributesMap}
+module.exports = {XMLLexer, XMLReader, SAXEvent, AttributesMap, MoxyLikeJsonEncoder}

package/lib/AttributesMap.js

@@ -1,35 +1,72 @@
+const CH_COLON = ':'.charCodeAt (0)
+
 const AttributesMap = class extends Map {
 
-	constructor (xmlReader) {
+	constructor (xmlReader, nsMap = null) {
 
 		super ()
-		
+
 		this._xmlReader = xmlReader
+		this._nsMap = nsMap
+
+		this.fixText = xmlReader.fixText
+
+	}
+
+	getLocalName (name) {
+
+		return (require ('./XMLNode.js')).getLocalName (name)
+
+	}
+
+	getNamespaceURI (name) {
+
+		return this._nsMap.getNamespaceURI (name)
+
+	}
+
+	get (name, namespaceURI = null) {
+	
+		if (namespaceURI === null) return super.get (name)
 		
-		this.fix = null
-		
-		if (xmlReader.useEntities) {
+		for (const k of this._nsMap.getQNames (name, namespaceURI)) {
 		
-			const {entityResolver} = xmlReader
+			if (!this.has (k)) continue
 			
-			this.fix = s => entityResolver.fix (s)
-		
-		}
+			return this.get (k)
 
+		}
+	
 	}
 	
 	set (k, v) {
 	
-		{
-		
-			const {fix} = this
-		
-			if (fix !== null) v = fix (v)
+		const {_nsMap} = this; if (_nsMap !== null) {
+
+			if (k.slice (0, 5) === 'xmlns') {
+			
+				if (k.length === 5) {
+
+					_nsMap.set ('', v)
+
+					return this
+
+				}
+
+				if (k.charCodeAt (5) === CH_COLON) {
+
+					_nsMap.set (k.slice (6), v)
+
+					return this
+
+				}
+			
+			}
 
 		}
 
-		return super.set (k, v)
-	
+		return super.set (k, this.fixText (v))
+
 	}
 
 }

package/lib/MoxyLikeJsonEncoder.js

@@ -0,0 +1,41 @@
+const SAXEvent = require ('./SAXEvent.js')
+
+const set = (o, k, nv) => {
+
+	if (!(k in o)) return o [k] = nv
+
+	const ov = o [k]; if (!Array.isArray (ov)) o [k] = [ov]
+	
+	o [k].push (nv)
+
+}
+
+const xform = ({children, attributes}) => {
+
+	let o = attributes == null ? {} : Object.fromEntries (attributes.entries ())
+
+	if (children != null) for (const child of children) switch (child.type) {
+
+		case SAXEvent.TYPES.CHARACTERS:  return child.text
+
+		case SAXEvent.TYPES.END_ELEMENT: set (o, child.localName, xform (child))
+
+	}
+	
+	return o
+
+}
+
+const MoxyLikeJsonEncoder = function (options = {}) {
+
+	return function (node) {
+	
+		let result = xform (node)
+	
+		return options.wrap ? {[node.localName]: result} : result
+			
+	}
+
+}
+
+module.exports = MoxyLikeJsonEncoder

package/lib/NamespacesMap.js

@@ -0,0 +1,48 @@
+const NamespacesMap = class extends Map {
+
+	constructor (xmlNode) {
+
+		const {parent} = xmlNode
+		
+		if (parent === null) {
+		
+			super ()
+		
+		}
+		else {
+
+			super (parent.namespacesMap)
+
+		}
+
+	}
+
+	getNamespaceURI (name, useDefault = false) {
+
+		const pos = name.indexOf (':'), noColon = pos === -1
+		
+		if (noColon && !useDefault) return null
+		
+		const key = noColon ? '' : name.slice (0, pos)
+		
+		if (!this.has (key)) return null
+		
+		return this.get (key)
+
+	}
+	
+	* getQNames (localName, namespaceURI) {
+	
+		for (let [k, v] of this.entries ()) 
+		
+			if (v === namespaceURI) 
+				
+				yield k === '' ? localName : 
+				
+					k + ':' + localName
+	
+	}
+
+}
+
+module.exports = NamespacesMap

package/lib/SAXEvent.js

@@ -1,6 +1,7 @@
 const assert     = require ('assert')
 
 const CH_LT          = '<'.charCodeAt (0)
+const CH_GT          = '>'.charCodeAt (0)
 const CH_EXCLAMATION = '!'.charCodeAt (0)
 const CH_QUESTION    = '?'.charCodeAt (0)
 const CH_SLASH       = '/'.charCodeAt (0)
@@ -46,7 +47,7 @@ const SAXEvent = class {
 
 					case CH_QUESTION: 
 
-						switch (src.slice (2, 5).toLowerCase ()) {
+						switch (src.slice (2, 5).toUpperCase ()) {
 
 							case STR_XML: return START_DOCUMENT
 
@@ -95,6 +96,20 @@ const SAXEvent = class {
 		}
 
 	}
+	
+	get xml () {
+	
+		switch (this.type) {
+		
+			case END_DOCUMENT: return ''
+		
+			case END_ELEMENT: return this.isSelfEnclosed ? '' : `</${this.name}>`
+			
+			default: return this.src
+		
+		}
+	
+	}
 
 	get attributes () {
 	
@@ -106,6 +121,38 @@ const SAXEvent = class {
 	
 	}
 	
+	get name () {
+	
+		if (this._afterName === 0) this.findAfterName ()
+		
+		const {src} = this, start = src.charCodeAt (1) === CH_SLASH ? 2 : 1
+
+		return this.src.slice (start, this._afterName).trim ()
+
+	}
+	
+	findAfterName () {
+	
+		const {src} = this, {length} = src; 
+
+		for (let i = 1; i < length; i ++) {
+		
+			const c = src.charCodeAt (i)
+			
+			switch (c) {
+				case CH_SLASH:
+				case CH_GT:
+					return this._afterName = i	
+			}
+		
+			if (c <= 32) return this._afterName = i
+				
+		}
+		
+		this._afterName = length - 1
+	
+	}
+	
 	writeAttributesToMap (m) {
 	
 		const {src} = this
@@ -149,6 +196,24 @@ const SAXEvent = class {
 	
 	}
 
+	get isStartElement () {
+		
+		return this.type === START_ELEMENT
+		
+	}
+
+	get isEndElement () {
+		
+		return this.type === END_ELEMENT
+		
+	}
+
+	get isCharacters () {
+		
+		return this.type === CHARACTERS
+		
+	}
+
 }
 
 SAXEvent.TYPES = {

package/lib/XMLNode.js

@@ -0,0 +1,141 @@
+const SAXEvent      = require ('./SAXEvent.js')
+const AttributesMap = require ('./AttributesMap')
+const NamespacesMap = require ('./NamespacesMap')
+
+const XML_READER = Symbol ('_xmlReader')
+const ATTRIBUTES = Symbol ('_attributes')
+const TYPE       = Symbol ('_type')
+const PARENT     = Symbol ('_parent')
+const LEVEL      = Symbol ('_level')
+const NS_MAP     = Symbol ('_ns_map')
+
+const XMLNode = class extends SAXEvent {
+
+	constructor (src, xmlReader, _type) {
+
+		super (src)
+
+		this [TYPE] = _type || super.type
+
+		this [XML_READER] = xmlReader
+		this [PARENT]     = null
+		this [LEVEL]      = 0
+		
+		this.children     = null
+
+	}
+
+	cloneStart () {
+
+		let e = new XMLNode (this.src, this [XML_READER], SAXEvent.TYPES.START_ELEMENT)
+
+		e [PARENT]     = this [PARENT]
+		e [LEVEL]      = this [LEVEL]
+		e [ATTRIBUTES] = this [ATTRIBUTES]
+		e [NS_MAP]     = this [NS_MAP]
+
+		return e
+
+	}
+
+	get level () {
+
+		return this [LEVEL]
+
+	}
+
+	get parent () {
+
+		return this [PARENT]
+
+	}
+	
+	get namespacesMap () {
+	
+		return this [NS_MAP]
+	
+	}
+
+	readNamespaces () {
+
+		this [NS_MAP] = new NamespacesMap (this) 
+
+		this.readAttributes ()
+
+	}
+
+	set parent (_parent) {
+
+		if (_parent == null) return
+
+		this [PARENT] = _parent
+
+		this [LEVEL] = 1 + _parent.level
+
+		const {children} = _parent; if (children !== null) children.push (this)
+
+	}
+
+	get type () {
+	
+		return this [TYPE]
+	
+	}
+
+	set type (_type) {
+	
+		this [TYPE] = _type
+	
+	}
+	
+	get localName () {
+
+		return XMLNode.getLocalName (this.name)
+
+	}
+
+	get namespaceURI () {
+	
+		return this.namespacesMap.getNamespaceURI (this.name, true)
+
+	}
+	
+	readAttributes () {
+
+		const m = new AttributesMap (this [XML_READER], this [NS_MAP])
+		
+		this.writeAttributesToMap (m)
+		
+		this [ATTRIBUTES] = m
+
+	}
+
+	get attributes () {
+	
+		if (!(ATTRIBUTES in this)) this.readAttributes ()
+
+		return this [ATTRIBUTES]
+	
+	}
+	
+	get text () {
+
+		let s = super.text
+		
+		if (this [TYPE] === SAXEvent.TYPES.CHARACTERS) s = this [XML_READER].fixText (s)
+
+		return s
+
+	}
+
+}
+
+XMLNode.getLocalName = name => {
+
+	const pos = name.indexOf (':'); if (pos === -1) return name
+		
+	return name.slice (pos + 1)
+
+}
+
+module.exports = XMLNode

package/lib/XMLReader.js

@@ -1,6 +1,11 @@
 const assert      = require ('assert')
 const {Transform} = require ('stream')
 const SAXEvent    = require ('./SAXEvent.js')
+const XMLNode     = require ('./XMLNode.js')
+const XMLLexer    = require ('./XMLLexer.js')
+
+const OPT_SRC  = Symbol ('_src')
+const OPT_SAX  = Symbol ('_sax')
 
 const XMLReader = class extends Transform {
 
@@ -15,14 +20,102 @@ const XMLReader = class extends Transform {
 		if (!('useEntities' in options)) options.useEntities = true
 		assert (options.useEntities === true || options.useEntities === false, 'options.useEntities must be boolean, not ' + typeof options.useEntities)
 
-		super (options)
+		if (!('useNamespaces' in options)) options.useNamespaces = true
+		assert (options.useNamespaces === true || options.useNamespaces === false, 'options.useNamespaces must be boolean, not ' + typeof options.useNamespaces)
+
+		let {filterElements} = options; delete options.filterElements; if (filterElements != null) {		
+			
+			assert (!('filter' in options), 'filter and filterElements options cannot be set simultaneously')
+			
+			switch (typeof filterElements) {
+			
+				case 'string':
+					const localName = filterElements
+					filterElements = e => e.localName === localName
+					
+				case 'function':
+					options.filter = e => e.type === SAXEvent.TYPES.END_ELEMENT && filterElements (e)
+					break
+					
+				default: 
+					assert.fail ('options.filterElements must be a string or function')
 
-		this.stripSpace  = options.stripSpace
-		this.useEntities = options.useEntities
+			}
 		
+		}
+
+		let {collect} = options; delete options.collect
+		assert (collect == null || typeof collect === 'function', 'options.collect must be a function, not ' + typeof collect)
+		if (collect == null && filterElements != null) collect = filterElements
+
+		const {filter} = options; delete options.filter
+		assert (filter == null || typeof filter === 'function', 'options.filter must be a function, not ' + typeof filter)
+
+		const {map} = options; delete options.map
+		assert (map == null || typeof map === 'function', 'options.map must be a function, not ' + typeof map)
+
+		super (options)
+
+		this.stripSpace    = options.stripSpace
+		this.useEntities   = options.useEntities
+		this.useNamespaces = options.useNamespaces
+		this.collect       = collect || null
+		this.filter        = filter || null
+		this.map           = map || null
+
 		if (this.useEntities) this.entityResolver = new (require ('./EntityResolver.js')) ()
 		
 		this.text = ''
+		this.element = null
+		this.position = 0n
+		
+		this [OPT_SRC] = null; this.on ('pipe', src => this [OPT_SRC] = src)
+		
+		this [OPT_SAX] = null
+
+	}
+	
+	async findFirst () {
+	
+		assert (!this.isSAX, 'SAX event subscriber detected, findFirst () cannot be used')
+
+		return new Promise ((ok, fail) => {
+		
+			this.once ('error', fail)
+			
+			const THE_END = 'finish',  nope = () => ok (null)
+
+			this.on (THE_END, nope)
+			
+			this.on ('data', e => {
+			
+				this.off (THE_END, nope)
+				
+				if (e.type === SAXEvent.TYPES.END_DOCUMENT) return nope ()
+
+				const src = this [OPT_SRC]; if (src !== null) src.unpipe (this)
+				
+				ok (e)
+				
+				this.destroy ()
+			
+			})
+		
+		})
+	
+	}
+
+	process (src, lexerOptions = {}) {
+
+		const lex = new XMLLexer (lexerOptions)
+		
+		lex.once ('error', x => this.destroy (x))
+		
+		lex.pipe (this)
+		
+		if (Buffer.isBuffer (src) || typeof src === 'string') lex.end (src); else src.pipe (lex)
+
+		return this
 
 	}
 
@@ -30,11 +123,42 @@ const XMLReader = class extends Transform {
 	
 		this.flush_text ()
 
-		this.push ({type: SAXEvent.TYPES.END_DOCUMENT})
+		this.publish (new XMLNode ('', this), SAXEvent.TYPES.END_DOCUMENT)
 
 		callback ()
 
 	}
+
+	get isSAX () {
+
+		const v = this [OPT_SAX]; if (v !== null) return v
+
+		for (const type of Object.values (SAXEvent.TYPES)) if (this.listenerCount (type) !== 0) return this [OPT_SAX] = true
+
+		return this [OPT_SAX] = false
+
+	}
+	
+	publish (xmlNode, type = null) {
+
+		if (type !== null) xmlNode.type = type
+
+		const {filter} = this; if (filter !== null && !filter (xmlNode)) return
+
+		const {map} = this, value = map === null ? xmlNode : map (xmlNode)
+				
+		if (this.isSAX) {
+
+			this.emit (xmlNode.type, value)
+
+		}
+		else {
+
+			this.push (value)
+
+		}		
+
+	}
 	
 	flush_text () {
 		
@@ -42,41 +166,104 @@ const XMLReader = class extends Transform {
 		
 		if (this.stripSpace) text = text.trim ()
 		
-		if (text.length !== 0) this.push (new SAXEvent (text))
+		if (text.length !== 0) {
+		
+			let e = new XMLNode (text, this, SAXEvent.TYPES.CHARACTERS)
+			
+			e.parent = this.element
+			
+			this.publish (e)
+		
+		}
 		
 		this.text = ''
 
 	}
+	
+	get fixText () {
+	
+		if (!this.useEntities) return s => s
+		
+		const {entityResolver} = this
+
+		return s => entityResolver.fix (s)
+
+	}
 
 	_transform (chunk, encoding, callback) {
 
-		if (chunk.length !== 0) {
+		const {length} = chunk; if (length !== 0) {
 
-			let e = new SAXEvent (chunk), {type} = e
+			let e = new XMLNode (chunk, this), {type} = e, {element} = this
 
 			switch (type) {
 
 				case SAXEvent.TYPES.CHARACTERS:
-
-					this.text += this.useEntities ? this.entityResolver.fix (e.text) : e.text
-					break
-
 				case SAXEvent.TYPES.CDATA:
 
 					this.text += e.text
-					break
+					return callback ()
 
 				default:
 
 					this.flush_text ()
-					this.push (e)
+
+			}
+
+			switch (type) {
+							
+				case SAXEvent.TYPES.END_ELEMENT:
+
+					if (element === null) throw new Error (`Unbalanced end element tag "${chunk}" occured at position ${this.position}`)
+
+					e = element
+
+					e.type = type
+
+					this.element = element.parent
+
 					break
 
+				default:
+
+					e.parent = element
+
 			}
 
-			if (type === SAXEvent.TYPES.START_ELEMENT && e.isSelfEnclosed) this.push (new SAXEvent ('</>'))
+			const isStart = type === SAXEvent.TYPES.START_ELEMENT
 
-		}
+			if (isStart && this.useNamespaces) e.readNamespaces ()
+
+			this.publish (isStart ? e.cloneStart () : e)
+			
+			if (isStart) {
+				
+				if (e.isSelfEnclosed) {
+
+					this.publish (e, SAXEvent.TYPES.END_ELEMENT)
+
+				}
+				else {
+				
+					if (
+					
+						(this.element !== null && this.element.children !== null)
+					
+						||
+						
+						(this.collect !== null && this.collect (e))
+					
+					) e.children = []
+
+					this.element = e
+
+				}
+
+			}
+
+			this.position += BigInt (length)
+
+		}		
 
 		callback ()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "0.0.3",
+  "version": "0.0.7",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/soap.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+  <SOAP-ENV:Header/>
+  <SOAP-ENV:Body>
+    <SendRequestRequest xmlns="urn://x-artefacts-smev-gov-ru/services/message-exchange/types/1.1" xmlns:ns0="urn://x-artefacts-smev-gov-ru/services/message-exchange/types/basic/1.1">
+      <SenderProvidedRequestData Id="Ue7e71ce1-7ce3-4ca5-a689-1a8f2edbb1af">
+        <MessageID>3931cda8-3245-11ec-b0bc-000c293433a0</MessageID>
+        <ns0:MessagePrimaryContent>
+          <ExportDebtRequestsRequest xmlns="urn:dom.gosuslugi.ru/debt-responses/1.0.0" xmlns:ns0="urn:dom.gosuslugi.ru/common/1.2.0">
+            <ns0:information-system-id ns0:foo="bar" foo="baz">1f0823b4-9c11-4622-a561-6bae5c0a00ba</ns0:information-system-id>
+            <ns0:organization-id>6eef689e-48bb-4eb0-55da-18b6db9909b7</ns0:organization-id>
+            <request-id>87c4c940-6ad3-11eb-9439-0242ac130002</request-id>
+          </ExportDebtRequestsRequest>
+        </ns0:MessagePrimaryContent>
+        <TestMessage xmlns:ns1="urn://x-artefacts-smev-gov-ru/services/message-exchange/types/1.1"/>
+      </SenderProvidedRequestData>
+      <CallerInformationSystemSignature>
+        <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:SignedInfo>
+            <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+            <ds:SignatureMethod Algorithm="urn:ietf:params:xml:ns:cpxmlsec:algorithms:gostr34102012-gostr34112012-256"/>
+            <ds:Reference URI="#Ue7e71ce1-7ce3-4ca5-a689-1a8f2edbb1af">
+              <ds:Transforms>
+                <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+                <ds:Transform Algorithm="urn://smev-gov-ru/xmldsig/transform"/>
+              </ds:Transforms>
+              <ds:DigestMethod Algorithm="urn:ietf:params:xml:ns:cpxmlsec:algorithms:gostr34112012-256"/>
+              <ds:DigestValue>XrXb2BlS8uo68tyQ++KE1yPjj5y3TynCaRIpXeL5uPk=</ds:DigestValue>
+            </ds:Reference>
+          </ds:SignedInfo>
+          <ds:SignatureValue>9Th1waEJy83XQxxKD5DXT29g885RhJoYe3ZQ1HrbrQLCEBchCCTJtcThYmNBPL/HzF2gp7KQs3gXrnsj+OBlJQ==</ds:SignatureValue>
+          <ds:KeyInfo>
+            <ds:X509Data>
+              <ds:X509Certificate>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</ds:X509Certificate>
+            </ds:X509Data>
+          </ds:KeyInfo>
+        </ds:Signature>
+      </CallerInformationSystemSignature>
+    </SendRequestRequest>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

package/test/test.js

@@ -1,6 +1,6 @@
 const fs = require ('fs')
 const assert = require ('assert')
-const {SAXEventEmitter, SAXEvent, XMLLexer, AttributesMap} = require ('../')
+const {XMLReader, SAXEvent, XMLLexer, AttributesMap, MoxyLikeJsonEncoder} = require ('../')
 
 async function test_001_lexer_sync (fn) {
 
@@ -52,55 +52,51 @@ async function test_003_emitter_sync (fn) {
 
 	const xml = fs.readFileSync (
 		'test/' + fn
-//		, 'utf-8'
+		, 'utf-8'
 	)
 	
 console.log (xml)
 
-	const lex = new XMLLexer ({
-//		maxLength: 40,
-//		encoding: 'ascii',
+	const sax = new XMLReader ({
 //		stripSpace: true,
+//		filterElements: 'SendRequestRequest',
+//		map: MoxyLikeJsonEncoder ({wrap: 1})
 	})
 
-	const sax = new SAXEventEmitter ({
-		stripSpace: true,
-//		useEntities: false,
-	})
-
-	lex.pipe (sax)
-
 /*
 	for (let event of [
-		'StartDocument',
-		'ProcessingInstruction',
-		'Comment',
-		'DTD',
-		'StartElement',
-		'Characters',
-		'EndElement',
-		'EndDocument',
-	]) sax.on (event, data => console.log ([event, data]))
-*/
-
-	sax.on ('StartElement', event => {
+		'data',
+		'close',
+		'end',
+		'finish',
+//		'EndElement',
+	]) sax.on (event, data => {
+			
+		console.log ([JSON.stringify (data, null, 2), event])
 	
-		console.log ({event})
-		
-		const attr = new AttributesMap (sax)
-		
-		event.writeAttributesToMap (attr)
-		
-		console.log ({attr})
-		
 	})
+*/
 
-//	lexer.on ('data', data => console.log ({data}))
 	
-//	for (let c of xml) lexer.write (c); lexer.end ()
-//	for (let c of xml) lexer.write (Buffer.from ([c])); lexer.end ()
+//	sax.process (fs.createReadStream ('test/' + fn))
+	
+	sax.process (xml)
+
+//console.log (sax)
+//console.log (sax.isSAX)
+
+
+	let s = ''
+	for await (const e of sax) {
+//		s += xml
+		console.log ([e.type, e.isStartElement, e.isEndElement , e.isCharacters])
+	}
+
+//console.log ([xml, s])
+
+//	const v = await sax.findFirst ()
 
-	lex.end (xml)
+//	console.log (JSON.stringify (v, null, 2))
 
 }
 
@@ -116,7 +112,8 @@ async function main () {
 //	await test_003_emitter_sync ('E05a.xml')
 //	await test_003_emitter_sync ('param_types.xml')
 //	await test_003_emitter_sync ('not-sa01.xml')
-	await test_003_emitter_sync ('ent.xml')
+//	await test_003_emitter_sync ('ent.xml')
+	await test_003_emitter_sync ('soap.xml')
 
 }
 

package/lib/SAXEventEmitter.js

@@ -1,15 +0,0 @@
-const XMLReader  = require ('./XMLReader.js')
-
-const SAXEventEmitter = class extends XMLReader {
-
-	constructor (options = {}) {
-
-		super (options)
-		
-		this.on ('data', e => this.emit (e.type, e))
-
-	}
-
-}
-
-module.exports = SAXEventEmitter