xml-twig 1.3.1 → 1.3.2

package/package.json

@@ -5,7 +5,7 @@
   },
   "name": "xml-twig",
   "description": "Node module for processing huge XML documents in tree mode",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "twig.js",
   "directories": {
     "doc": "doc"

package/test.js

@@ -2,10 +2,10 @@ const fs = require('fs');
 const twig = require('./twig.js');
 
 
-//const parser = twig.createParser({ tag: twig.Any, function: anyHandler }, { method: "sax" });
+const parser = twig.createParser({ tag: twig.Any, function: anyHandler }, { method: "sax" });
 //const parser = twig.createParser({ tag: twig.Any, function: anyHandler }, { method: "expat" });
 //const parser = twig.createParser({ tag: twig.Any, function: anyHandler }, { method: "saxophone" });
-//fs.createReadStream(`${__dirname}/samples/bookstore.xml`).pipe(parser);
+fs.createReadStream(`${__dirname}/samples/bookstore.xml`).pipe(parser);
 //fs.createReadStream(`${__dirname}/samples/breakfast-menu.xml`).pipe(parser);
 
 //const parser = twig.createParser({ tag: twig.Any, function: nsHandler }, { method: "sax", xmlns: true });

package/twig.js

@@ -483,8 +483,6 @@ function reset() {
    current = undefined;
 }
 
-let closeXMLWriterElement = true;
-
 /**
  * Generic class modeling a XML Node
  * @class Twig
@@ -766,7 +764,7 @@ class Twig {
    * @returns {string} The XML-Tree which is currently available in RAM - no valid XML Structure
    */
    debug = function () {
-      return this.root().writer(true, this).output;
+      return this.root().writer(true, true).output;
    };
 
    /**
@@ -774,17 +772,16 @@ class Twig {
    * @param {external:XMLWriter} xw - The writer object
    * @param {Twig[]} childArray - Array of child elements
    */
-   #addChild = function (xw, childArray, startElement) {
+   #addChild = function (xw, childArray, cur, debug) {
       for (let elt of childArray) {
          xw.startElement(elt.name);
          for (let [key, val] of Object.entries(elt.attributes))
             xw.writeAttribute(key, val);
          if (elt.text !== null)
             xw.text(elt.text);
-         this.#addChild(xw, elt.children(), startElement);
-         if (elt === startElement) closeXMLWriterElement = false;
+         this.#addChild(xw, elt.children(), elt, debug);         
       }
-      if (closeXMLWriterElement) xw.endElement();
+      if (!debug || Object.isSealed(cur)) xw.endElement();
    };
 
    /**
@@ -792,18 +789,17 @@ class Twig {
    * @param {?boolean|string|external:XMLWriter} par - `true` or intention character or an already created XMLWriter
    * @returns {external:XMLWriter} 
    */
-   writer = function (par, startElement) {
+   writer = function (par, debug) {
       const XMLWriter = require('xml-writer');
       let xw = par instanceof XMLWriter ? par : new XMLWriter(par);
-      closeXMLWriterElement = true
 
       xw.startElement(this.#name);
       for (let [key, val] of Object.entries(this.#attributes))
          xw.writeAttribute(key, val);
       if (this.#text !== null)
          xw.text(this.#text);
-      this.#addChild(xw, this.#children, startElement);
-      if (closeXMLWriterElement) xw.endElement();
+      this.#addChild(xw, this.#children, this, debug);
+      if (!debug || Object.isSealed(this)) xw.endElement();
       return xw;
    };