xml-toolkit 1.0.45 → 1.0.47

package/lib/XMLNode.js

@@ -9,6 +9,7 @@ const TYPE       = Symbol ('_type')
 const PARENT     = Symbol ('_parent')
 const LEVEL      = Symbol ('_level')
 const NS_MAP     = '_ns_map'
+const NO_CHILDREN = []
 
 const m2o = m => Object.fromEntries (m.entries ())
 
@@ -23,8 +24,39 @@ const XMLNode = class extends SAXEvent {
 		this [ENTITY_RESOLVER] = entityResolver
 		this [PARENT]     = null
 		this [LEVEL]      = 0
-		
-		this.children     = []
+
+	}
+
+	get children () {
+
+		return this.children = this.isLeaf ? NO_CHILDREN : []
+
+	}
+
+	set children (value) {
+
+		Object.defineProperty (this, 'children', {value,
+            writable: true,
+            configurable: false,
+            enumerable: false,
+		})
+
+	}
+
+	get isLeaf () {
+
+		switch (this [TYPE]) {
+
+			case SAXEvent.TYPES.START_ELEMENT:
+				return this.isSelfEnclosed
+
+			case SAXEvent.TYPES.END_ELEMENT:
+				return false
+
+			default:
+				return true
+
+		}
 
 	}
 
@@ -146,17 +178,17 @@ const XMLNode = class extends SAXEvent {
 
 	get text () {
 
-		let s = super.text
-
-		if (this [TYPE] === SAXEvent.TYPES.CHARACTERS) {
+		const s = super.text; if (this [TYPE] !== SAXEvent.TYPES.CHARACTERS) return s
 			
-			const entityResolver = this [ENTITY_RESOLVER]
-		
-			if (entityResolver) return entityResolver.fix (s)
-		
-		}
+		const entityResolver = this [ENTITY_RESOLVER]; return entityResolver ? entityResolver.fix (s) : s
+
+	}
+
+	get innerText () {
+
+		const {children} = this; if (!Array.isArray (children) || children.length === 0) return this.text
 
-		return s
+		let s = ''; for (const child of children) s += child.innerText; return s
 
 	}
 

package/lib/XMLParser.js

@@ -58,7 +58,6 @@ const XMLParser = class {
 							
 				case SAXEvent.TYPES.START_ELEMENT:
 					
-					node.children = []
 					node.parent = this.element
 					if (this.useNamespaces) node.readNamespaces ()
 					this.element = node

package/lib/XMLReader.js

@@ -7,6 +7,8 @@ const XMLLexer    = require ('./XMLLexer.js')
 const OPT_SRC  = Symbol ('_src')
 const OPT_SAX  = Symbol ('_sax')
 
+const NO_CHILDREN = []; NO_CHILDREN.push = () => {}
+
 const XMLReader = class extends Transform {
 
 	constructor (options = {}) {
@@ -44,10 +46,6 @@ const XMLReader = class extends Transform {
 		
 		}
 
-		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)
 
@@ -59,7 +57,6 @@ const XMLReader = class extends Transform {
 		this.stripSpace    = options.stripSpace
 		this.useEntities   = options.useEntities
 		this.useNamespaces = options.useNamespaces
-		this.collect       = collect || null
 		this.filter        = filter || null
 		this.map           = map || null
 
@@ -141,7 +138,32 @@ const XMLReader = class extends Transform {
 
 		if (type !== null) xmlNode.type = type
 
-		const {filter} = this; if (filter !== null && !filter (xmlNode)) return
+		const {filter} = this; if (filter !== null) {
+
+			if (!filter (xmlNode)) return
+
+			let node = xmlNode; while (true) {
+
+				node = node.parent; if (!node) break
+
+				if (node.children === NO_CHILDREN || node.toBePublished) continue
+
+				const end = new XMLNode ('</' + node.src.slice (1), this.entityResolver)
+
+				if (filter (end)) {
+
+					node.toBePublished = true
+
+				}
+				else {
+
+					node.children = NO_CHILDREN
+
+				}
+
+			}
+
+		}
 
 		const {map} = this, value = map === null ? xmlNode : map (xmlNode)
 				

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [