ff-dom 1.0.18-beta.2 → 1.0.18-beta.3

package/dist/index.browser.js

@@ -1,6 +1,6 @@
 const reWhiteSpace$1 = /^[\S]+( [\S]+)*$/gi;
+let cspEnabled = false;
 const xpathCache$1 = {};
-let multiElementReferenceMode = false;
 let relativeXPathCache = new Map();
 let modifiedElementAttributes$1 = [];
 let mutationObserver;
@@ -59,7 +59,7 @@ const getTextContent = (targetElement) => {
 const getFilteredText = (element) => {
     return element?.childNodes[0]?.nodeValue || "";
 };
-const getCountOfXPath = (xpath, element, docmt) => {
+const getCountOfXPath = (xpath, element, docmt, multiElementReferenceMode = false) => {
     try {
         let count;
         // Check if result is cached
@@ -73,7 +73,23 @@ const getCountOfXPath = (xpath, element, docmt) => {
             count = owner.evaluate(`count(${xpath})`, docmt, null, XPathResult.NUMBER_TYPE, null).numberValue;
             xpathCache$1[xpath] = count;
         }
-        if (multiElementReferenceMode && Array.isArray(element)) ;
+        if (multiElementReferenceMode && Array.isArray(element)) {
+            if (count > 1) {
+                const elementsFromXpath = getElementFromXpath(xpath, docmt, true);
+                let nodex, matchedCount = 0;
+                if (elementsFromXpath instanceof XPathResult) {
+                    while ((nodex = elementsFromXpath?.iterateNext())) {
+                        if (element.includes(nodex)) {
+                            matchedCount += 1;
+                            if (matchedCount === 2)
+                                break;
+                        }
+                    }
+                }
+                if (matchedCount !== 2)
+                    return 0;
+            }
+        }
         else {
             // Short-circuit if we only need to match one element
             if (count === 1) {
@@ -212,12 +228,6 @@ const getRelationship = (a, b) => {
                         ? "self"
                         : "";
 };
-const findRoot = (node) => {
-    while (node && node.parentNode) {
-        node = node.parentNode;
-    }
-    return node;
-};
 const isSvg = (element) => {
     return element instanceof SVGElement;
 };
@@ -855,12 +865,12 @@ const getReferenceElementsXpath = (domNode, docmt, isTarget) => {
     }
     return xpaths1;
 };
-function parseXml(xmlStr) {
+const parseXml = (xmlStr) => {
     if (window.DOMParser) {
         return new window.DOMParser().parseFromString(xmlStr, "text/xml");
     }
     return null;
-}
+};
 const normalizeXPath = (xpath) => {
     // Replace text() = "value"  or  text()='value'
     xpath = xpath.replace(/text\(\)\s*=\s*(['"])(.*?)\1/g, "normalize-space(.)=$1$2$1");
@@ -908,6 +918,7 @@ const xpathUtils = {
     startObserver,
     stopObserver,
     modifiedElementAttributes: modifiedElementAttributes$1,
+    cspEnabled
 };
 
 let xpathData$1 = [];
@@ -1617,7 +1628,7 @@ const parseDOM = (element, doc, isIndex, isTarget) => {
             const len = xpathData$1.length;
             for (let i = 0; i < len; i++) {
                 let xpth = xpathData$1[i].value;
-                xpth = xpth.replace(tag, "*");
+                xpth = "//*" + xpth.substring(xpth.indexOf("//") + 2 + tag.length);
                 const count = getCountOfXPath(xpth, element, docmt);
                 if (count === 1) {
                     xpathData$1.push({
@@ -1652,13 +1663,12 @@ const xpath = {
 let xpathDataWithIndex = [];
 let xpathData = [];
 const reWhiteSpace = /^[\S]+( [\S]+)*$/gi;
-const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex) => {
+const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex, multiElementReferenceMode = false) => {
     // debugger;
     const par1 = element1.parentElement;
     const par2 = element2.parentElement;
     let rel_xpath = [];
     let tempElement;
-    findRoot(element1);
     let finalXpaths = [];
     if (isIndex) {
         if (xpathDataWithIndex.length) {
@@ -1678,14 +1688,14 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         // both are same
         if (element1.isSameNode(element2)) {
             // rel_xpath = xpath1 + "/self::" + element1.tagName;
-            rel_xpath = getXpathRelationExpression(element1, element2, "self", xpaths1, xpaths2, isIndex);
+            rel_xpath = getXpathRelationExpression(element1, element2, "self", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
             if (rel_xpath)
                 finalXpaths = finalXpaths.concat(rel_xpath);
         }
         // parent
         tempElement = element1.parentElement;
         if (tempElement === element2) {
-            rel_xpath = getXpathRelationExpression(element1, element2, "parent", xpaths1, xpaths2, isIndex);
+            rel_xpath = getXpathRelationExpression(element1, element2, "parent", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
             if (rel_xpath)
                 finalXpaths = finalXpaths.concat(rel_xpath);
         }
@@ -1693,7 +1703,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         tempElement = element1.parentElement;
         while (tempElement !== null) {
             if (tempElement === element2) {
-                rel_xpath = getXpathRelationExpression(element1, element2, "ancestor", xpaths1, xpaths2, isIndex);
+                rel_xpath = getXpathRelationExpression(element1, element2, "ancestor", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
                 if (rel_xpath) {
                     finalXpaths = finalXpaths.concat(rel_xpath);
                     break;
@@ -1705,7 +1715,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         tempElement = element1;
         do {
             if (tempElement === element2) {
-                rel_xpath = getXpathRelationExpression(element1, element2, "ancestor-or-self", xpaths1, xpaths2, isIndex);
+                rel_xpath = getXpathRelationExpression(element1, element2, "ancestor-or-self", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
                 if (rel_xpath) {
                     finalXpaths = finalXpaths.concat(rel_xpath);
                     break;
@@ -1717,7 +1727,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         if (par1?.isSameNode(par2)) {
             for (let m = element1.nextElementSibling; m != null; m = m.nextElementSibling) {
                 if (m != null && m.isSameNode(element2)) {
-                    rel_xpath = getXpathRelationExpression(element1, element2, "following-sibling", xpaths1, xpaths2, isIndex);
+                    rel_xpath = getXpathRelationExpression(element1, element2, "following-sibling", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
                     if (rel_xpath) {
                         finalXpaths = finalXpaths.concat(rel_xpath);
                         break;
@@ -1726,7 +1736,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
             }
             for (let n = element1.previousElementSibling; n != null; n = n.previousElementSibling) {
                 if (n != null && n.isSameNode(element2)) {
-                    rel_xpath = getXpathRelationExpression(element1, element2, "preceding-sibling", xpaths1, xpaths2, isIndex);
+                    rel_xpath = getXpathRelationExpression(element1, element2, "preceding-sibling", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
                     if (rel_xpath) {
                         finalXpaths = finalXpaths.concat(rel_xpath);
                         break;
@@ -1738,7 +1748,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         if (element1?.children?.length) {
             for (let m = element1.children[0]; m !== null; m = m?.nextElementSibling) {
                 if (m === element2) {
-                    rel_xpath = getXpathRelationExpression(element1, element2, "child", xpaths1, xpaths2, isIndex);
+                    rel_xpath = getXpathRelationExpression(element1, element2, "child", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
                     if (rel_xpath) {
                         finalXpaths = finalXpaths.concat(rel_xpath);
                         break;
@@ -1749,18 +1759,18 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         // following
         const relation = element1.compareDocumentPosition(element2);
         if (relation === 2) {
-            rel_xpath = getXpathRelationExpression(element1, element2, "preceding", xpaths1, xpaths2, isIndex);
+            rel_xpath = getXpathRelationExpression(element1, element2, "preceding", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
         }
         if (relation === 4) {
-            rel_xpath = getXpathRelationExpression(element1, element2, "following", xpaths1, xpaths2, isIndex);
+            rel_xpath = getXpathRelationExpression(element1, element2, "following", xpaths1, xpaths2, isIndex, multiElementReferenceMode);
         }
         if (rel_xpath) {
             finalXpaths = finalXpaths.concat(rel_xpath);
         }
-        const descendantXpath = getDescendantXpath([element1, element2], docmt, xpaths1, xpaths2, "descendant", isIndex);
+        const descendantXpath = getDescendantXpath([element1, element2], docmt, xpaths1, xpaths2, "descendant", isIndex, multiElementReferenceMode);
         if (descendantXpath)
             finalXpaths = finalXpaths.concat(descendantXpath);
-        const descendantSelfXpath = getDescendantXpath([element1, element2], docmt, xpaths1, xpaths2, "descedant-or-self", isIndex);
+        const descendantSelfXpath = getDescendantXpath([element1, element2], docmt, xpaths1, xpaths2, "descedant-or-self", isIndex, multiElementReferenceMode);
         if (descendantSelfXpath) {
             finalXpaths = finalXpaths.concat(descendantSelfXpath);
         }
@@ -1777,7 +1787,7 @@ const findRelativeXpath = (element1, element2, docmt, xpaths1, xpaths2, isIndex)
         return [finalXpaths[0]];
     }
 };
-const descendantExpression = (refExpectElement, xpath2, relation, docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength) => {
+const descendantExpression = (refExpectElement, xpath2, relation, docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength = 0, multiElementReferenceMode = false) => {
     let finalExpectedElementXpath = "";
     if (xpath2.split(/\/(?=(?:[^']*\'[^\']*\')*[^\']*$)/g)?.length >=
         expCommonParentXpathElements.length) {
@@ -1791,7 +1801,7 @@ const descendantExpression = (refExpectElement, xpath2, relation, docmt, isIndex
         const traverseXpath = getTraverseXpathExpression(`${step4 +
             (refCommonParentXpathElementLength
                 ? "]".repeat(refCommonParentXpathElementLength)
-                : "")}`, xpaths2Els, refExpectElement[refExpectElement.length - 1], refExpectElement, docmt, relation, isIndex);
+                : "")}`, xpaths2Els, refExpectElement[refExpectElement.length - 1], refExpectElement, docmt, relation, isIndex, multiElementReferenceMode);
         if (traverseXpath) {
             return traverseXpath;
         }
@@ -1828,7 +1838,7 @@ const descendantExpression = (refExpectElement, xpath2, relation, docmt, isIndex
         }
     }
 };
-const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation, isIndex) => {
+const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation, isIndex = false, multiElementReferenceMode = false) => {
     const refElement = refExpectElement[refExpectElement.length - 2];
     const expElement = refExpectElement[refExpectElement.length - 1];
     const expElementDocmnt = getShadowRoot(expElement) ?? expElement.ownerDocument;
@@ -1892,7 +1902,7 @@ const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation,
                 xpath2 = xpathData[i].value; // No need to modify the value
             }
             if (xpath2) {
-                return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength);
+                return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength, multiElementReferenceMode);
             }
         }
     }
@@ -1919,7 +1929,7 @@ const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation,
                         else {
                             xpath2 = xpathData[i].value; // No need to modify the value
                         }
-                        return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength);
+                        return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength, multiElementReferenceMode);
                     }
                 }
             }
@@ -1950,7 +1960,7 @@ const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation,
                             else {
                                 xpath2 = xpathData[i].value; // No need to modify the value
                             }
-                            return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength);
+                            return descendantExpression(refExpectElement, xpath2, relation, expElementDocmnt || docmt, isIndex, expCommonParentXpathElements, step4, refCommonParentXpathElementLength, multiElementReferenceMode);
                         }
                     }
                 }
@@ -1963,12 +1973,12 @@ const getDescendantXpath = (refExpectElement, docmt, xpaths1, xpaths2, relation,
     const traverseXpath = getTraverseXpathExpression(`${step4 +
         (refCommonParentXpathElementLength
             ? "]".repeat(refCommonParentXpathElementLength)
-            : "")}`, expCommonParentXpathElements.reverse(), refExpectElement[refExpectElement.length - 1], refExpectElement, docmt, relation, isIndex);
+            : "")}`, expCommonParentXpathElements, refExpectElement[refExpectElement.length - 1], refExpectElement, docmt, relation, isIndex, multiElementReferenceMode);
     if (traverseXpath) {
         return traverseXpath;
     }
 };
-const getXpathRelationExpression = (element1, element2, relation, xpath1, xpath2, isIndex) => {
+const getXpathRelationExpression = (element1, element2, relation, xpath1, xpath2, isIndex, multiElementReferenceMode) => {
     let xpaths1;
     let xpaths2;
     console.log('getXpathRelationExpression', relation);
@@ -2035,7 +2045,7 @@ const getXpathRelationExpression = (element1, element2, relation, xpath1, xpath2
                     if (xpath2Elements.length > 1) {
                         const traverseXpath = getTraverseXpathExpression(`${xpaths1[i].value.indexOf("//") !== 0
                             ? replaceActualAttributes(xpaths1[i].value, element1)
-                            : replaceActualAttributes(xpaths1[i].value.substring(xpaths1[i].value.indexOf("//") + 2), element1)}`, xpath2Elements, element2, [element1, element2], element2.ownerDocument, relation, isIndex);
+                            : replaceActualAttributes(xpaths1[i].value.substring(xpaths1[i].value.indexOf("//") + 2), element1)}`, xpath2Elements, element2, [element1, element2], element2.ownerDocument, relation, isIndex, multiElementReferenceMode);
                         console.log('getXpathRelationExpression traverseXpath', traverseXpath);
                         if (traverseXpath) {
                             finalXpaths.concat(traverseXpath);
@@ -2108,9 +2118,9 @@ const getReferenceElementXpath = (element) => {
     });
     return xpaths1;
 };
-const getTraverseXpathExpression = (xpathe1, absoluteXpathElements, element2, refExpectElement, docmt, relation, isIndex) => {
+const getTraverseXpathExpression = (xpathe1, absoluteXpathElements, element2, refExpectElement, docmt, relation, isIndex, multiElementReferenceMode) => {
     let finalExpectedElementXpath;
-    {
+    if (!multiElementReferenceMode) {
         for (let x = 1; x <= absoluteXpathElements.length; x++) {
             const xpath2 = absoluteXpathElements
                 .slice(absoluteXpathElements.length - x, absoluteXpathElements.length)
@@ -2140,6 +2150,32 @@ const getTraverseXpathExpression = (xpathe1, absoluteXpathElements, element2, re
             }
         }
     }
+    else {
+        const xpath2 = absoluteXpathElements.join("/");
+        finalExpectedElementXpath = `//${xpathe1}/${relation}::${replaceActualAttributes(xpath2)}`;
+        const rel_count = getCountOfXPath(finalExpectedElementXpath, element2, docmt);
+        if (rel_count === 1) {
+            return [
+                {
+                    key: `dynamic ${relation}`,
+                    value: replaceTempAttributes(finalExpectedElementXpath),
+                },
+            ];
+        }
+        if (rel_count > 1) {
+            if (isIndex) {
+                finalExpectedElementXpath = findXpathWithIndex(finalExpectedElementXpath, refExpectElement[refExpectElement.length - 1], docmt, rel_count);
+                if (finalExpectedElementXpath) {
+                    return [
+                        {
+                            key: `dynamic ${relation}${isIndex ? " index" : ""}`,
+                            value: replaceTempAttributes(finalExpectedElementXpath),
+                        },
+                    ];
+                }
+            }
+        }
+    }
 };
 const referenceXpath = {
     findRelativeXpath,