chore!: rename node.attrsMap to node.attributes

cheminfo · Sep 3, 2021 · a630b11 · a630b11
1 parent 4501cb4
commit a630b11
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/XMLNode.js b/src/XMLNode.js
@@ -1,10 +1,10 @@
 export class XMLNode {
-  constructor(tagName, parent, val) {
+  constructor(tagName, parent, value) {
     this.tagName = tagName;
     this.parent = parent;
     this.children = Object.create({}); //child tags
-    this.attrsMap = Object.create({}); //attributes map
-    this.val = val; //text only
+    this.attributes = Object.create({}); //attributes map
+    this.val = value; //text only
     this.startIndex = -1;
   }
   addChild(child) {

diff --git a/src/traversable/getTraversable.js b/src/traversable/getTraversable.js
@@ -52,8 +52,8 @@ export function getTraversable(xmlData, options) {
           options.stopNodes.includes(currentNode.tagName)
         ) {
           currentNode.children = [];
-          if (currentNode.attrsMap === undefined) {
-            currentNode.attrsMap = {};
+          if (currentNode.attributes === undefined) {
+            currentNode.attributes = {};
           }
           currentNode.val = xmlData.subarray(currentNode.startIndex + 1, i);
         }
@@ -191,7 +191,10 @@ export function getTraversable(xmlData, options) {
 
           const childNode = new XMLNode(tagName, currentNode, '');
           if (tagAttributes) {
-            childNode.attrsMap = parseAttributesString(tagAttributes, options);
+            childNode.attributes = parseAttributesString(
+              tagAttributes,
+              options,
+            );
           }
           currentNode.addChild(childNode);
         } else {
@@ -205,7 +208,10 @@ export function getTraversable(xmlData, options) {
             childNode.startIndex = closeIndex;
           }
           if (tagAttributes && shouldBuildAttributesMap) {
-            childNode.attrsMap = parseAttributesString(tagAttributes, options);
+            childNode.attributes = parseAttributesString(
+              tagAttributes,
+              options,
+            );
           }
           currentNode.addChild(childNode);
           currentNode = childNode;

diff --git a/src/traversableToJSON.js b/src/traversableToJSON.js
@@ -22,7 +22,7 @@ export function traversableToJSON(node, options, parentTagName) {
   // when no child node or attr is present
   if (
     (!node.children || isEmptyObject(node.children)) &&
-    (!node.attrsMap || isEmptyObject(node.attrsMap))
+    (!node.attributes || isEmptyObject(node.attributes))
   ) {
     return node.val === undefined ? '' : node.val;
   }
@@ -38,7 +38,7 @@ export function traversableToJSON(node, options, parentTagName) {
     result[options.textNodeName] = asArray ? [node.val] : node.val;
   }
 
-  merge(result, node.attrsMap, arrayMode);
+  merge(result, node.attributes, arrayMode);
 
   const keys = Object.keys(node.children);
   for (let index = 0; index < keys.length; index++) {