xml-toolkit 0.0.7 → 0.0.8

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,4 +1,4 @@
-const SAXEvent = require ('./SAXEvent.js')
+const SAXEvent = require ('./SAXEvent.js'), {CHARACTERS, END_ELEMENT} = SAXEvent.TYPES
 
 const set = (o, k, nv) => {
 
@@ -12,13 +12,19 @@ const set = (o, k, nv) => {
 
 const xform = ({children, attributes}) => {
 
-	let o = attributes == null ? {} : Object.fromEntries (attributes.entries ())
+	let o = null
+
+	if (attributes != null && attributes.size !== 0) o = Object.fromEntries (attributes.entries ())
 
 	if (children != null) for (const child of children) switch (child.type) {
 
-		case SAXEvent.TYPES.CHARACTERS:  return child.text
+		case CHARACTERS:  return child.text
 
-		case SAXEvent.TYPES.END_ELEMENT: set (o, child.localName, xform (child))
+		case END_ELEMENT:
+		
+			if (o === null) o = {}
+			
+			set (o, child.localName, xform (child))
 
 	}
 	

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "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

@@ -59,8 +59,8 @@ console.log (xml)
 
 	const sax = new XMLReader ({
 //		stripSpace: true,
-//		filterElements: 'SendRequestRequest',
-//		map: MoxyLikeJsonEncoder ({wrap: 1})
+		filterElements: 'SendRequestRequest',
+		map: MoxyLikeJsonEncoder ({wrap: 1})
 	})
 
 /*
@@ -77,26 +77,22 @@ 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) {
-//		s += xml
-		console.log ([e.type, e.isStartElement, e.isEndElement , e.isCharacters])
+		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))
+	console.log (JSON.stringify (v, null, 2))
 
 }