performance optimizations and refactoring

Author: GeneratorX16

lib/core/utils/dq-element.js

@@ -22,27 +22,31 @@ function getOuterHtml(element) {
   return source || '';
 }
 
-function createTruncatedAttributeOuterHtml(element, truncatedAttributeSet) {
-  if (!element) {return;}
+function truncateAttributes(element, truncatedAttributeSet) {
+  if (!element) {
+    return;
+  }
 
   const copyNode = element.cloneNode(true);
 
   let str = getOuterHtml(copyNode);
-  if (!truncatedAttributeSet || truncatedAttributeSet.size === 0) {return str;}
+  if (!truncatedAttributeSet || truncatedAttributeSet.size === 0) {
+    return str;
+  }
 
   let intermediateAttrString = '';
-  const tagNameEnd = str.indexOf('>');
+  const openingTagEndIndex = str.indexOf('>');
 
   for (const truncatedAttr of truncatedAttributeSet) {
     intermediateAttrString += `${truncatedAttr.substring(0, 20)}... `;
   }
 
   str =
-    str.substring(0, tagNameEnd) +
+    str.substring(0, openingTagEndIndex) +
     ' ' +
     intermediateAttrString +
     ' ' +
-    str.substring(tagNameEnd);
+    str.substring(openingTagEndIndex);
   return str;
 }
 
@@ -55,41 +59,31 @@ function truncateElement(element, maxLength, maxAttributeLength) {
 
   const elementAttributes = element.attributes;
   const lastIndex = elementAttributes.length - 1;
+  let currElementStr = truncateAttributes(copyNode, attributesToTruncate);
 
   for (let i = lastIndex; i >= 0; i--) {
-    const attribute = elementAttributes[i];
+    if (currElementStr.indexOf('>') < maxLength) {break;}
 
+    const attribute = elementAttributes[i];
     const attributeLength = attribute.value.length + attribute.name.length;
-    if (
-      createTruncatedAttributeOuterHtml(copyNode, attributesToTruncate).indexOf(
-        '>'
-      ) < maxLength
-    )
-      {break;}
 
     if (attributeLength > maxAttributeLength) {
       attributesToTruncate.add(attribute.name);
       copyNode.attributes.removeNamedItem(attribute.name);
+      currElementStr = truncateAttributes(copyNode, attributesToTruncate);
     }
   }
 
-  let modifiedCurrentStr = createTruncatedAttributeOuterHtml(
-    copyNode,
-    attributesToTruncate
-  );
-
-  if (modifiedCurrentStr.indexOf('>') > maxLength) {
-    modifiedCurrentStr = modifiedCurrentStr.substring(0, maxLength) + '...>';
+  if (currElementStr.indexOf('>') > maxLength) {
+    currElementStr = currElementStr.substring(0, maxLength) + '...>';
   }
 
-  if (modifiedCurrentStr.length > maxLength) {
-    modifiedCurrentStr = modifiedCurrentStr.substring(
-      0,
-      modifiedCurrentStr.indexOf('>') + 1
-    );
+  if (currElementStr.length > maxLength) {
+    const endIndex = currElementStr.indexOf('>');
+    currElementStr = currElementStr.substring(0, endIndex + 1);
   }
 
-  return modifiedCurrentStr;
+  return currElementStr;
 }
 
 function getSource(element) {