xml-toolkit 0.0.5 → 0.0.9

package/index.js

@@ -3,5 +3,6 @@ const XMLReader           = require ('./lib/XMLReader')
 const SAXEvent            = require ('./lib/SAXEvent')
 const AttributesMap       = require ('./lib/AttributesMap')
 const MoxyLikeJsonEncoder = require ('./lib/MoxyLikeJsonEncoder')
+const XMLNode             = require ('./lib/XMLNode')
 
-module.exports = {XMLLexer, XMLReader, SAXEvent, AttributesMap, MoxyLikeJsonEncoder}
+module.exports = {XMLLexer, XMLReader, SAXEvent, AttributesMap, MoxyLikeJsonEncoder, XMLNode}

package/lib/AttributesMap.js

@@ -65,7 +65,7 @@ const AttributesMap = class extends Map {
 
 		}
 
-		return super.set (k, this.fixText (v))
+		return super.set (k, v === '' ? null : this.fixText (v))
 
 	}
 

package/lib/MoxyLikeJsonEncoder.js

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

package/lib/SAXEvent.js

@@ -96,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 () {
 	
@@ -182,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

@@ -1,6 +1,7 @@
 const SAXEvent      = require ('./SAXEvent.js')
 const AttributesMap = require ('./AttributesMap')
 const NamespacesMap = require ('./NamespacesMap')
+const MoxyLikeJsonEncoder = require ('./MoxyLikeJsonEncoder')
 
 const XML_READER = Symbol ('_xmlReader')
 const ATTRIBUTES = Symbol ('_attributes')
@@ -25,6 +26,20 @@ const XMLNode = class extends SAXEvent {
 
 	}
 
+	cloneStart () {
+
+		let e = new XMLNode (this.src, this [XML_READER], SAXEvent.TYPES.START_ELEMENT)
+
+		e [PARENT]     = this [PARENT]
+		e [LEVEL]      = this [LEVEL]
+
+		if (ATTRIBUTES in this) e [ATTRIBUTES] = this [ATTRIBUTES]
+		if (NS_MAP     in this) e [NS_MAP]     = this [NS_MAP]
+
+		return e
+
+	}
+
 	get level () {
 
 		return this [LEVEL]
@@ -83,7 +98,9 @@ const XMLNode = class extends SAXEvent {
 
 	get namespaceURI () {
 	
-		return this.namespacesMap.getNamespaceURI (this.name, true)
+		const {namespacesMap} = this; if (namespacesMap == null) return null
+	
+		return namespacesMap.getNamespaceURI (this.name, true)
 
 	}
 	
@@ -125,4 +142,6 @@ XMLNode.getLocalName = name => {
 
 }
 
+XMLNode.toObject = MoxyLikeJsonEncoder
+
 module.exports = XMLNode

package/lib/XMLReader.js

@@ -14,7 +14,7 @@ const XMLReader = class extends Transform {
 		options.decodeStrings = false
 		options.objectMode = true
 		
-		if (!('stripSpace' in options)) options.stripSpace = false
+		if (!('stripSpace' in options)) options.stripSpace = ('filterElements' in options)
 		assert (options.stripSpace === true || options.stripSpace === false, 'options.stripSpace must be boolean, not ' + typeof options.stripSpace)
 
 		if (!('useEntities' in options)) options.useEntities = true
@@ -123,7 +123,7 @@ const XMLReader = class extends Transform {
 	
 		this.flush_text ()
 
-		this.publish ({type: SAXEvent.TYPES.END_DOCUMENT})
+		this.publish (new XMLNode ('', this), SAXEvent.TYPES.END_DOCUMENT)
 
 		callback ()
 
@@ -234,7 +234,7 @@ const XMLReader = class extends Transform {
 
 			if (isStart && this.useNamespaces) e.readNamespaces ()
 
-			this.publish (e)
+			this.publish (isStart ? e.cloneStart () : e)
 			
 			if (isStart) {
 				

package/package.json

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

package/test/soap.xml

@@ -2,7 +2,7 @@
   <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">
+      <SenderProvidedRequestData Id="Ue7e71ce1-7ce3-4ca5-a689-1a8f2edbb1af" IDDQD="">
         <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">

package/test/test.js

@@ -1,6 +1,6 @@
 const fs = require ('fs')
 const assert = require ('assert')
-const {XMLReader, SAXEvent, XMLLexer, AttributesMap, MoxyLikeJsonEncoder} = require ('../')
+const {XMLReader, SAXEvent, XMLLexer, AttributesMap, XMLNode} = require ('../')
 
 async function test_001_lexer_sync (fn) {
 
@@ -52,15 +52,19 @@ async function test_003_emitter_sync (fn) {
 
 	const xml = fs.readFileSync (
 		'test/' + fn
-//		, 'utf-8'
+		, 'utf-8'
 	)
 	
 console.log (xml)
 
 	const sax = new XMLReader ({
-		stripSpace: true,
+//		stripSpace: true,
 		filterElements: 'SendRequestRequest',
-		map: MoxyLikeJsonEncoder ({wrap: 1})
+		map: XMLNode.toObject ({
+//			wrap: 1,
+			getName: (localName, namespaceURI) => (!namespaceURI ? '' : '{' + namespaceURI + '}') + localName,
+			map: o => Object.fromEntries (Object.entries (o).map (([k, v]) => [k + '111', v]))
+		})
 	})
 
 /*
@@ -77,21 +81,20 @@ console.log (xml)
 	})
 */
 
-	
-//	sax.process (fs.createReadStream ('test/' + fn))
-	
-	sax.process (xml)
-
+		
 //console.log (sax)
 //console.log (sax.isSAX)
 
 /*
+	let s = ''
 	for await (const e of sax) {
-		console.log (e)
+		s += xml
+//		console.log ([e.type, e.isStartElement, e.isEndElement , e.isCharacters])
 	}
 */
+//console.log ([xml, s])
 
-	const v = await sax.findFirst ()
+	const v = await sax.process (xml).findFirst ()
 
 	console.log (JSON.stringify (v, null, 2))