feat!: Only change attribute names when creating JSON

BREAKING CHANGE
The node match exactly the XML in order to easily filter it using callback

Author: lpatiny

src/parse.js

@@ -6,7 +6,7 @@ import { traversableToJSON } from './traversableToJSON';
  * Parse an ArrayBuffer or Uint8Array representing an XML
  * @param {ArrayBuffer|Uint8Arra} xmlData
  * @param {object} [options={}]
- * @param {string} [attributeNamePrefix='@_']
+ * @param {string} [attributeNamePrefix='$']
  * @param {boolean} [attributesNodeName=false]
  * @param {string} [textNodeName='#text']
  * @param {boolean} [trimValues=true] should we remove ascii < 32

src/traversable/parseAttributesString.js

@@ -1,6 +1,6 @@
 import { parseString } from 'dynamic-typing';
 
-import { getAllMatches } from '../util';
+import { getAllMatches, isEmptyObject } from '../util';
 
 const newLocal = '([^\\s=]+)\\s*(=\\s*([\'"])(.*?)\\3)?';
 const attrsRegx = new RegExp(newLocal, 'g');
@@ -22,23 +22,16 @@ export function parseAttributesString(string, options) {
           match[4] = match[4].trim();
         }
         match[4] = options.attributeValueProcessor(match[4], attrName);
-        attributes[options.attributeNamePrefix + attrName] = stringParseValue(
+        attributes[attrName] = stringParseValue(
           match[4],
           options.dynamicTypingAttributeValue,
         );
       } else if (options.allowBooleanAttributes) {
-        attributes[options.attributeNamePrefix + attrName] = true;
+        attributes[attrName] = true;
       }
     }
   }
-  if (!Object.keys(attributes).length) {
-    return;
-  }
-  if (options.attributesNodeName) {
-    const attrCollection = {};
-    attrCollection[options.attributesNodeName] = attributes;
-    return attrCollection;
-  }
+  if (isEmptyObject(attributes)) return;
   return attributes;
 }
 

src/traversableToJSON.js

@@ -38,7 +38,24 @@ export function traversableToJSON(node, options, parentTagName) {
     result[options.textNodeName] = asArray ? [node.value] : node.value;
   }
 
-  merge(result, node.attributes, arrayMode);
+  if (node.attributes && !isEmptyObject(node.attributes)) {
+    let attributes = options.parseAttributesString ? {} : node.attributes;
+    if (options.attributeNamePrefix) {
+      // need to rename the attributes
+      const renamedAttributes = {};
+      for (let key in node.attributes) {
+        renamedAttributes[options.attributeNamePrefix + key] =
+          node.attributes[key];
+      }
+      attributes = renamedAttributes;
+    }
+    if (options.attributesNodeName) {
+      let encapsulatedAttributes = {};
+      encapsulatedAttributes[options.attributesNodeName] = attributes;
+      attributes = encapsulatedAttributes;
+    }
+    merge(result, attributes, arrayMode);
+  }
 
   const keys = Object.keys(node.children);
   for (let index = 0; index < keys.length; index++) {

src/util.js

@@ -25,15 +25,15 @@ export function isEmptyObject(obj) {
 /**
  * Copy all the properties of a into b.
  * @param {object} target
- * @param {object} a
+ * @param {object} source
  */
-export function merge(target, a, arrayMode) {
-  if (!a) return;
-  for (const key in a) {
+export function merge(target, source, arrayMode) {
+  if (!source) return;
+  for (const key in source) {
     if (arrayMode === 'strict') {
-      target[key] = [a[key]];
+      target[key] = [source[key]];
     } else {
-      target[key] = a[key];
+      target[key] = source[key];
     }
   }
 }