refactor!: rename node.val to node.value

cheminfo · Sep 3, 2021 · 2b27e37 · 2b27e37
1 parent a630b11
commit 2b27e37
Show file tree

Hide file tree

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

diff --git a/src/traversable/getTraversable.js b/src/traversable/getTraversable.js
@@ -41,10 +41,10 @@ export function getTraversable(xmlData, options) {
           const value = options.trimValues
             ? arrayTrim(xmlData.subarray(dataIndex, dataIndex + dataSize))
             : xmlData.subarray(dataIndex, dataIndex + dataSize);
-          if (currentNode.val === undefined) {
-            currentNode.val = value;
+          if (currentNode.value === undefined) {
+            currentNode.value = value;
           } else {
-            currentNode.val = concat(currentNode.val, value);
+            currentNode.value = concat(currentNode.value, value);
           }
         }
         if (
@@ -55,7 +55,7 @@ export function getTraversable(xmlData, options) {
           if (currentNode.attributes === undefined) {
             currentNode.attributes = {};
           }
-          currentNode.val = xmlData.subarray(currentNode.startIndex + 1, i);
+          currentNode.value = xmlData.subarray(currentNode.startIndex + 1, i);
         }
         currentNode = currentNode.parent;
         i = closeIndex;
@@ -78,8 +78,8 @@ export function getTraversable(xmlData, options) {
         );
         if (currentNode && dataSize !== 0) {
           if (currentNode.tagName !== '!xml') {
-            currentNode.val = concat(
-              currentNode.val,
+            currentNode.value = concat(
+              currentNode.value,
               options.trimValues
                 ? arrayTrim(xmlData.subarray(dataIndex, dataSize + dataIndex))
                 : xmlData.subarray(dataIndex, dataSize + dataIndex),
@@ -122,7 +122,7 @@ export function getTraversable(xmlData, options) {
             ? arrayTrim(xmlData.subarray(dataIndex, dataIndex + dataSize))
             : xmlData.subarray(dataIndex, dataIndex + dataSize);
 
-          currentNode.val = concat(currentNode.val, value);
+          currentNode.value = concat(currentNode.value, value);
         }
 
         if (options.cdataTagName) {
@@ -135,10 +135,10 @@ export function getTraversable(xmlData, options) {
           currentNode.addChild(childNode);
           //add rest value to parent node
           if (tagExp) {
-            childNode.val = tagExp;
+            childNode.value = tagExp;
           }
         } else {
-          currentNode.val = concat(currentNode.val, tagExp);
+          currentNode.value = concat(currentNode.value, tagExp);
         }
 
         i = closeIndex + 2;
@@ -169,8 +169,8 @@ export function getTraversable(xmlData, options) {
         //save text to parent node
         if (currentNode && dataSize !== 0) {
           if (currentNode.tagName !== '!xml') {
-            currentNode.val = concat(
-              currentNode.val,
+            currentNode.value = concat(
+              currentNode.value,
               options.trimValues
                 ? arrayTrim(xmlData.subarray(dataIndex, dataIndex + dataSize))
                 : xmlData.subarray(dataIndex, dataIndex + dataSize),

diff --git a/src/traversable/parseAttributesString.js b/src/traversable/parseAttributesString.js
@@ -42,11 +42,11 @@ export function parseAttributesString(string, options) {
   return attributes;
 }
 
-function stringParseValue(val, shouldParse) {
-  if (shouldParse && typeof val === 'string') {
-    return parseString(val);
+function stringParseValue(value, shouldParse) {
+  if (shouldParse && typeof value === 'string') {
+    return parseString(value);
   } else {
-    return val === undefined ? '' : val;
+    return value === undefined ? '' : value;
   }
 }
 

diff --git a/src/traversableToJSON.js b/src/traversableToJSON.js
@@ -14,28 +14,28 @@ export function traversableToJSON(node, options, parentTagName) {
   const result = {};
 
   if (tagValueProcessor) {
-    node.val = node.val && tagValueProcessor(node.val, node);
+    node.value = node.value && tagValueProcessor(node.value, node);
   }
-  if (typeof node.val === 'string' && dynamicTypingNodeValue) {
-    node.val = parseString(node.val);
+  if (typeof node.value === 'string' && dynamicTypingNodeValue) {
+    node.value = parseString(node.value);
   }
   // when no child node or attr is present
   if (
     (!node.children || isEmptyObject(node.children)) &&
     (!node.attributes || isEmptyObject(node.attributes))
   ) {
-    return node.val === undefined ? '' : node.val;
+    return node.value === undefined ? '' : node.value;
   }
 
   // otherwise create a textnode if node has some text
-  if (node.val !== undefined && node.val.length !== 0) {
+  if (node.value !== undefined && node.value.length !== 0) {
     const asArray = isTagNameInArrayMode(
       node.tagName,
       arrayMode,
       parentTagName,
     );
 
-    result[options.textNodeName] = asArray ? [node.val] : node.val;
+    result[options.textNodeName] = asArray ? [node.value] : node.value;
   }
 
   merge(result, node.attributes, arrayMode);