Revert "Fix #167: '>' in attribute value"

This reverts commit b46db1b.

Author: amitguptagwl

spec/attr_spec.js

@@ -132,39 +132,6 @@ describe("XMLParser", function() {
         expect(result).toBe(true);
     });
 
-    it("should parse an attribute with '>' ", function() {
-        const xmlData = `<element id="7>" str="" data><selfclosing/><selfclosing /><selfclosingwith attr/></element>`;
-        const expected = {
-            "element": {
-                "id": '7>',
-                "str": "",
-                "data": true,
-                "selfclosing": [
-                    "",
-                    ""
-                ],
-                "selfclosingwith": {
-                    "attr": true
-                }
-            }
-        };
-
-        let result = parser.parse(xmlData, {
-            attributeNamePrefix:    "",
-            ignoreAttributes:       false,
-            parseAttributeValue:    true,
-            allowBooleanAttributes: true
-        });
-
-        //console.log(JSON.stringify(result,null,4));
-        expect(result).toEqual(expected);
-
-        result = validator.validate(xmlData, {
-            allowBooleanAttributes: true
-        });
-        expect(result).toBe(true);
-    });
-
     it("should not remove xmlns when namespaces are not set to be ignored", function() {
         const xmlData = `<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"></project>`;
         const expected = {

src/xmlstr2xmlnode.js

@@ -4,10 +4,8 @@ const util = require('./util');
 const buildOptions = require('./util').buildOptions;
 const xmlNode = require('./xmlNode');
 const TagType = {OPENING: 1, CLOSING: 2, SELF: 3, CDATA: 4};
-const attrstr_regex = '((\\s*[\\w\\-._:]+(=((\'([^\']*)\')|("([^"]*)")))?)*)\\s*';
-let regx = '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|(([\\w:\\-._]*:)?([\\w:\\-._]+))'+attrstr_regex+'(\\/)?>|((\\/)(([\\w:\\-._]*:)?([\\w:\\-._]+))\\s*>))([^<]*)';
-  //'<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|(([\\w:\\-._]*:)?([\\w:\\-._]+))([^>]*)>|((\\/)(([\\w:\\-._]*:)?([\\w:\\-._]+))\\s*>))([^<]*)';
-  
+let regx =
+  '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|(([\\w:\\-._]*:)?([\\w:\\-._]+))([^>]*)>|((\\/)(([\\w:\\-._]*:)?([\\w:\\-._]+))\\s*>))([^<]*)';
 
 //const tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(\\s*"+cdataRegx+")*([^<]+)?","g");
 //const tagsRegx = new RegExp("<(\\/?)((\\w*:)?([\\w:\\-\._]+))([^>]*)>([^<]*)("+cdataRegx+"([^<]*))*([^<]+)?","g");
@@ -81,14 +79,12 @@ const getTraversalObj = function(xmlData, options) {
   let tag = tagsRegx.exec(xmlData);
   let nextTag = tagsRegx.exec(xmlData);
   while (tag) {
-    //console.log(tag)
     const tagType = checkForTagType(tag);
-    //console.log(tagType)
 
     if (tagType === TagType.CLOSING) {
       //add parsed data to parent node
-      if (currentNode.parent && tag[22]) {
-        currentNode.parent.val = util.getValue(currentNode.parent.val) + '' + processTagValue(tag[22], options);
+      if (currentNode.parent && tag[14]) {
+        currentNode.parent.val = util.getValue(currentNode.parent.val) + '' + processTagValue(tag[14], options);
       }
       if (options.stopNodes.length && options.stopNodes.includes(currentNode.tagname)) {
         currentNode.child = []
@@ -105,29 +101,29 @@ const getTraversalObj = function(xmlData, options) {
         //for backtracking
         currentNode.val = util.getValue(currentNode.val) + options.cdataPositionChar;
         //add rest value to parent node
-        if (tag[22]) {
-          currentNode.val += processTagValue(tag[22], options);
+        if (tag[14]) {
+          currentNode.val += processTagValue(tag[14], options);
         }
       } else {
-        currentNode.val = (currentNode.val || '') + (tag[3] || '') + processTagValue(tag[22], options);
+        currentNode.val = (currentNode.val || '') + (tag[3] || '') + processTagValue(tag[14], options);
       }
     } else if (tagType === TagType.SELF) {
-      if (currentNode && tag[22]) {
-        currentNode.val = util.getValue(currentNode.val) + '' + processTagValue(tag[22], options);
+      if (currentNode && tag[14]) {
+        currentNode.val = util.getValue(currentNode.val) + '' + processTagValue(tag[14], options);
       }
 
       const childNode = new xmlNode(options.ignoreNameSpace ? tag[7] : tag[5], currentNode, '');
-      /* if (tag[8] && tag[8].length > 0) {
+      if (tag[8] && tag[8].length > 0) {
         tag[8] = tag[8].substr(0, tag[8].length - 1);
-      } */
+      }
       childNode.attrsMap = buildAttributesMap(tag[8], options);
       currentNode.addChild(childNode);
     } else {
       //TagType.OPENING
       const childNode = new xmlNode(
         options.ignoreNameSpace ? tag[7] : tag[5],
         currentNode,
-        processTagValue(tag[22], options)
+        processTagValue(tag[14], options)
       );
       if (options.stopNodes.length && options.stopNodes.includes(childNode.tagname)) {
         childNode.startIndex=tag.index + tag[1].length
@@ -159,9 +155,9 @@ function processTagValue(val, options) {
 function checkForTagType(match) {
   if (match[4] === ']]>') {
     return TagType.CDATA;
-  } else if (match[18] === '/') {
+  } else if (match[10] === '/') {
     return TagType.CLOSING;
-  } else if (match[16] === '/') {
+  } else if (typeof match[8] !== 'undefined' && match[8].substr(match[8].length - 1) === '/') {
     return TagType.SELF;
   } else {
     return TagType.OPENING;