xml-toolkit 0.0.8 → 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/MoxyLikeJsonEncoder.js

@@ -1,45 +1,63 @@
 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 = null
+		const set = (nv, localName, namespaceURI) => {
+		
+			const k = getName (localName, namespaceURI)
 
-	if (attributes != null && attributes.size !== 0) o = Object.fromEntries (attributes.entries ())
+			if (o === null) return o = {[k]: nv}
 
-	if (children != null) for (const child of children) switch (child.type) {
+			if (!(k in o)) return o [k] = nv
 
-		case CHARACTERS:  return child.text
+			const ov = o [k]; if (!Array.isArray (ov)) return o [k] = [ov, nv]
 
-		case END_ELEMENT:
-		
-			if (o === null) o = {}
+			ov.push (nv)
+
+		}
+
+		if (attributes != null)
+					
+			for (const [name, value] of attributes.entries ())
 			
-			set (o, child.localName, xform (child))
+				set (value, attributes.getLocalName (name), attributes.getNamespaceURI (name))
 
-	}
-	
-	return o
+		if (children != null) for (const child of children) switch (child.type) {
 
-}
+			case CHARACTERS:
+			
+				return child.text
 
-const MoxyLikeJsonEncoder = function (options = {}) {
+			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/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')
@@ -31,8 +32,9 @@ const XMLNode = class extends SAXEvent {
 
 		e [PARENT]     = this [PARENT]
 		e [LEVEL]      = this [LEVEL]
-		e [ATTRIBUTES] = this [ATTRIBUTES]
-		e [NS_MAP]     = this [NS_MAP]
+
+		if (ATTRIBUTES in this) e [ATTRIBUTES] = this [ATTRIBUTES]
+		if (NS_MAP     in this) e [NS_MAP]     = this [NS_MAP]
 
 		return e
 
@@ -96,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)
 
 	}
 	
@@ -138,4 +142,6 @@ XMLNode.getLocalName = name => {
 
 }
 
+XMLNode.toObject = MoxyLikeJsonEncoder
+
 module.exports = XMLNode

package/package.json

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

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) {
 
@@ -60,7 +60,11 @@ console.log (xml)
 	const sax = new XMLReader ({
 //		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]))
+		})
 	})
 
 /*