xml-toolkit 0.0.5 → 0.0.6

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 () {
 	

package/lib/XMLNode.js

@@ -25,6 +25,19 @@ 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]
+		e [ATTRIBUTES] = this [ATTRIBUTES]
+		e [NS_MAP]     = this [NS_MAP]
+
+		return e
+
+	}
+
 	get level () {
 
 		return this [LEVEL]

package/lib/XMLReader.js

@@ -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.6",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -52,15 +52,15 @@ 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,
-		filterElements: 'SendRequestRequest',
-		map: MoxyLikeJsonEncoder ({wrap: 1})
+//		stripSpace: true,
+//		filterElements: 'SendRequestRequest',
+//		map: MoxyLikeJsonEncoder ({wrap: 1})
 	})
 
 /*
@@ -85,15 +85,18 @@ console.log (xml)
 //console.log (sax)
 //console.log (sax.isSAX)
 
-/*
-	for await (const e of sax) {
-		console.log (e)
+
+	let s = ''
+	for await (const {type, src, xml, parent} of sax) {
+		s += xml
+//		console.log ([type, src, xml, (parent || {}).localName])
 	}
-*/
 
-	const v = await sax.findFirst ()
+console.log ([xml, s])
+
+//	const v = await sax.findFirst ()
 
-	console.log (JSON.stringify (v, null, 2))
+//	console.log (JSON.stringify (v, null, 2))
 
 }