Fix optional parser; Version bump for npm

Author: nfarina

lib/xmldoc.js

@@ -20,18 +20,19 @@
     }
   }
 
-  /*
+  /**
    * XmlElement is our basic building block. Everything is an XmlElement; even XmlDocument
    * behaves like an XmlElement by inheriting its attributes and functions.
    */
-
-  function XmlElement(tag, parserIn) {
-    // Capture the parser object off of the XmlDocument delegate
-    var delegate = delegates[delegates.length - 1];
-    var parser = parserIn;
-    
-    if (delegate) {
-      parser = delegate.parser;
+  function XmlElement(tag, parser) {
+    // If you didn't hand us a parser (common case) see if we can grab one
+    // from the current execution stack.
+    if (!parser) {
+      var delegate = delegates[delegates.length - 1];
+
+      if (delegate.parser) {
+        parser = delegate.parser;
+      }
     }
 
     this.name = tag.name;
@@ -42,10 +43,10 @@
     this.lastChild = null;
 
     // Assign parse information
-    this.line = parser?.line;
-    this.column = parser?.column;
-    this.position = parser?.position;
-    this.startTagPosition = parser?.startTagPosition;
+    this.line = parser ? parser.line : null;
+    this.column = parser ? parser.column : null;
+    this.position = parser ? parser.position : null;
+    this.startTagPosition = parser ? parser.startTagPosition : null;
   }
 
   // Private methods
@@ -136,20 +137,20 @@
     }
     return undefined;
   };
-  
+
   XmlElement.prototype.descendantsNamed = function (name) {
-     var matches = [];
+    var matches = [];
 
-     for (var i = 0, l = this.children.length; i < l; i++) {
-       var child = this.children[i];
-       if (child.type === "element") {
-         if (child.name === name) matches.push(child);
-         matches = matches.concat(child.descendantsNamed(name));
-       }
-     }
+    for (var i = 0, l = this.children.length; i < l; i++) {
+      var child = this.children[i];
+      if (child.type === "element") {
+        if (child.name === name) matches.push(child);
+        matches = matches.concat(child.descendantsNamed(name));
+      }
+    }
 
-     return matches;
-   };
+    return matches;
+  };
 
   XmlElement.prototype.descendantWithPath = function (path) {
     var descendant = this;
@@ -275,11 +276,10 @@
   XmlCDataNode.prototype.type = "cdata";
   XmlCommentNode.prototype.type = "comment";
 
-  /*
+  /**
    * XmlDocument is the class we expose to the user; it uses the sax parser to create a hierarchy
    * of XmlElements.
    */
-
   function XmlDocument(xml) {
     xml && (xml = xml.toString().trim());
 
@@ -297,10 +297,12 @@
     // It's safe to use a global because JS is single-threaded.
     delegates = [this];
 
-    this.parser.write(xml);
-
-    // Remove the parser as it is no longer needed and should not be exposed to clients
-    delete this.parser;
+    try {
+      this.parser.write(xml);
+    } finally {
+      // Remove the parser as it is no longer needed and should not be exposed to clients
+      delete this.parser;
+    }
   }
 
   // make XmlDocument inherit XmlElement's methods

package.json

@@ -6,7 +6,7 @@
     "email": "[email protected]",
     "url": "http://nfarina.com"
   },
-  "version": "1.2.0",
+  "version": "1.3.0",
   "main": "./index",
   "scripts": {
     "test": "tap test/*.js",