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

package/dist/index.cdn.js

@@ -2,8 +2,8 @@
     'use strict';
 
     const reWhiteSpace$1 = /^[\S]+( [\S]+)*$/gi;
+    let cspEnabled = false;
     const xpathCache$1 = {};
-    let multiElementReferenceMode = false;
     let relativeXPathCache = new Map();
     let modifiedElementAttributes$1 = [];
     let mutationObserver;
@@ -62,7 +62,7 @@
     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
@@ -76,7 +76,23 @@
                 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) {
@@ -215,12 +231,6 @@
                             ? "self"
                             : "";
     };
-    const findRoot = (node) => {
-        while (node && node.parentNode) {
-            node = node.parentNode;
-        }
-        return node;
-    };
     const isSvg = (element) => {
         return element instanceof SVGElement;
     };
@@ -462,9 +472,9 @@
             while (currentNode) {
                 let xpathe = "";
                 let hasUniqueAttr = false;
-                let attributes = domNode === currentNode ? attributesArray : currentNode.attributes;
+                let attributes = domNode === currentNode ? attributesArray ?? currentNode.attributes : currentNode.attributes;
                 // Loop through attributes to check for unique identifiers
-                for (const attrName of attributes) {
+                for (const attrName of Array.from(attributes)) {
                     if (checkBlockedAttributes(attrName, currentNode, isTarget)) {
                         let attrValue = attrName.nodeValue;
                         // Clean up attribute value
@@ -781,7 +791,7 @@
             }
         }
         if (domNode.attributes) {
-            for (const attrName of domNode.attributes) {
+            for (const attrName of Array.from(domNode.attributes)) {
                 if (checkBlockedAttributes(attrName, domNode, isTarget)) {
                     let attrValue = attrName.nodeValue;
                     if (attrValue) {
@@ -858,12 +868,12 @@
         }
         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");
@@ -911,6 +921,7 @@
         startObserver,
         stopObserver,
         modifiedElementAttributes: modifiedElementAttributes$1,
+        cspEnabled
     };
 
     let xpathData$1 = [];
@@ -993,7 +1004,7 @@
             let currentNode = domNode;
             while (currentNode && currentNode.nodeType === 1) {
                 const hasUniqueAttr = false;
-                for (const attrName of currentNode.attributes) {
+                for (const attrName of Array.from(currentNode.attributes)) {
                     if (checkBlockedAttributes(attrName, currentNode, isTarget)) {
                         let attrValue = attrName.nodeValue;
                         attrValue = attrValue?.replace("removePointers", "") ?? "";
@@ -1099,7 +1110,7 @@
                 }
                 // BASE CASE #2: Check for unique attributes
                 let uniqueAttrFound = false;
-                for (const attr of currentNode.attributes) {
+                for (const attr of Array.from(currentNode.attributes)) {
                     if (checkBlockedAttributes(attr, currentNode, isTarget)) {
                         let attrValue = attr.nodeValue;
                         attrValue = attrValue?.replace("removePointers", "") ?? "";
@@ -1175,7 +1186,7 @@
             do {
                 let uniqueAttrFound = false;
                 for (currentNode = st.pop(); currentNode !== null;) {
-                    for (const attr of currentNode.attributes) {
+                    for (const attr of Array.from(currentNode.attributes)) {
                         if (checkBlockedAttributes(attr, currentNode, true)) {
                             let attrValue = attr.nodeValue;
                             attrValue = attrValue?.replace("removePointers", "") ?? "";
@@ -1257,7 +1268,7 @@
     const processSibling = (sibling, domNode, docmt, nodeXpath, axis, isTarget) => {
         try {
             if (sibling.hasAttributes()) {
-                for (const attr of sibling.attributes) {
+                for (const attr of Array.from(sibling.attributes)) {
                     let xpathe = intermediateXpathStep(sibling, {
                         name: attr.name,
                         value: attr.value,
@@ -1614,13 +1625,13 @@
         const docmt = targetElemt?.ownerDocument || doc;
         const tag = targetElemt.tagName;
         const { attributes } = targetElemt;
-        addAllXPathAttributes([...attributes], targetElemt, docmt, isIndex, isTarget);
+        addAllXPathAttributes(Array.from(attributes), targetElemt, docmt, isIndex, isTarget);
         {
             if (xpathData$1.length) {
                 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({
@@ -1633,7 +1644,7 @@
         }
         console.log(xpathData$1);
         if (!xpathData$1.length) {
-            addRelativeXpaths(targetElemt, docmt, isIndex, isTarget, [...targetElemt.attributes]);
+            addRelativeXpaths(targetElemt, docmt, isIndex, isTarget, Array.from(targetElemt.attributes));
         }
         return xpathData$1;
     };
@@ -1655,13 +1666,12 @@
     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) {
@@ -1681,14 +1691,14 @@
             // 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);
             }
@@ -1696,7 +1706,7 @@
             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;
@@ -1708,7 +1718,7 @@
             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;
@@ -1720,7 +1730,7 @@
             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;
@@ -1729,7 +1739,7 @@
                 }
                 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;
@@ -1741,7 +1751,7 @@
             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;
@@ -1752,18 +1762,18 @@
             // 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);
             }
@@ -1780,7 +1790,7 @@
             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) {
@@ -1794,7 +1804,7 @@
             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;
             }
@@ -1831,7 +1841,7 @@
             }
         }
     };
-    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;
@@ -1895,13 +1905,13 @@
                     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);
                 }
             }
         }
         if (refExpectElement[refExpectElement.length - 2].attributes) {
-            for (const attrName of refExpectElement[refExpectElement.length - 2]
-                .attributes) {
+            for (const attrName of Array.from(refExpectElement[refExpectElement.length - 2]
+                .attributes)) {
                 if (checkBlockedAttributes(attrName, refExpectElement[refExpectElement.length - 2], false)) {
                     let attrValue = attrName.nodeValue;
                     if (attrValue) {
@@ -1922,13 +1932,13 @@
                             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);
                         }
                     }
                 }
             }
-            for (const attrName of refExpectElement[refExpectElement.length - 2]
-                .attributes) {
+            for (const attrName of Array.from(refExpectElement[refExpectElement.length - 2]
+                .attributes)) {
                 if (checkBlockedAttributes(attrName, refExpectElement[refExpectElement.length - 2], false)) {
                     let attrValue = attrName.nodeValue;
                     if (attrValue) {
@@ -1953,7 +1963,7 @@
                                 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);
                             }
                         }
                     }
@@ -1966,12 +1976,12 @@
         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);
@@ -2038,7 +2048,7 @@
                         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);
@@ -2078,7 +2088,7 @@
             xpaths1 = [
                 {
                     key: "",
-                    value: getRelativeXPath(element, element.ownerDocument, false, false, [...element.attributes]),
+                    value: getRelativeXPath(element, element.ownerDocument, false, false, Array.from(element.attributes)),
                 },
             ];
         }
@@ -2086,7 +2096,7 @@
             xpaths1 = [
                 {
                     key: "",
-                    value: getRelativeXPath(element, element.ownerDocument, true, false, [...element.attributes]),
+                    value: getRelativeXPath(element, element.ownerDocument, true, false, Array.from(element.attributes)),
                 },
             ];
             xpaths1 = xpaths1?.map((x) => x.value.charAt(0) == "(" &&
@@ -2111,9 +2121,9 @@
         });
         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)
@@ -2143,6 +2153,32 @@
                 }
             }
         }
+        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,

package/dist/types/browser/browser/xpath.d.ts

@@ -20,22 +20,22 @@ export declare const createXPathAPI: () => {
         checkRelativeXpathRelation: (nodeXpath1: string, nodeXpath2: string, targetElemt: HTMLElement | Element, docmt: Document, isIndex: boolean, relationType: string) => string | null;
     };
     referenceXpaths: {
-        findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: any) => any[] | undefined;
+        findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: boolean, multiElementReferenceMode?: boolean) => any[] | undefined;
         getDescendantXpath: (refExpectElement: Array<HTMLElement | Element>, docmt: Document, xpaths1: {
             key: string;
             value: string;
         }[], xpaths2: {
             key: string;
             value: string;
-        }[], relation: "descendant" | "descedant-or-self", isIndex: boolean) => {
+        }[], relation: "descendant" | "descedant-or-self", isIndex?: boolean, multiElementReferenceMode?: boolean) => {
             key: string;
             value: string;
         }[] | undefined;
-        getXpathRelationExpression: (element1: HTMLElement | Element, element2: HTMLElement | Element, relation: string, xpath1: any[], xpath2: any[], isIndex: any) => {
+        getXpathRelationExpression: (element1: HTMLElement | Element, element2: HTMLElement | Element, relation: string, xpath1: any[], xpath2: any[], isIndex: boolean, multiElementReferenceMode: boolean) => {
             key: string;
             value: any;
         }[];
-        getTraverseXpathExpression: (xpathe1: string, absoluteXpathElements: any[], element2: HTMLElement | Element, refExpectElement: Array<HTMLElement | Element>, docmt: Node, relation: string, isIndex: any) => {
+        getTraverseXpathExpression: (xpathe1: string, absoluteXpathElements: string[], element2: HTMLElement | Element, refExpectElement: Array<HTMLElement | Element>, docmt: Node, relation: string, isIndex: boolean, multiElementReferenceMode: boolean) => {
             key: string;
             value: string;
         }[] | undefined;
@@ -45,7 +45,7 @@ export declare const createXPathAPI: () => {
         }[];
     };
     xpathUtils: {
-        parseXml: typeof import("../utils/xpathHelpers.ts").parseXml;
+        parseXml: (xmlStr: string) => Document | null;
         getReferenceElementsXpath: (domNode: HTMLElement | Element, docmt: Document, isTarget: boolean) => {
             key: string;
             value: string;
@@ -59,7 +59,7 @@ export declare const createXPathAPI: () => {
         findXpathWithIndex: (val: string, node: HTMLElement | Element, docmt: Node, count: number) => string | undefined;
         isNumberExist: (str: string) => boolean;
         getTextContent: (targetElement: HTMLElement | Element) => string;
-        getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node) => number;
+        getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node, multiElementReferenceMode?: boolean) => number;
         normalizeXPath: (xpath: string) => string;
         getShadowRoot: (a: HTMLElement | Element) => Element | null;
         escapeCharacters: (text: string) => string;
@@ -68,7 +68,7 @@ export declare const createXPathAPI: () => {
             name: string;
             value: string;
         }, targetElement: HTMLElement | Element, isTarget: boolean) => boolean;
-        getRelationship: (a: HTMLElement, b: HTMLElement) => "" | "preceding" | "following" | "ancestor" | "descendant" | "self";
+        getRelationship: (a: HTMLElement, b: HTMLElement) => string;
         findMatchingParenthesis: (text: string, openPos: number) => number;
         deleteGarbageFromInnerText: (a: string) => string;
         replaceTempAttributes: (str: string) => string;
@@ -81,6 +81,7 @@ export declare const createXPathAPI: () => {
             element: HTMLElement | Element;
             doc: Document;
         }[];
+        cspEnabled: boolean;
     };
     getElementsFromHTML: (record: import("../types/locator.ts").ElementRecord, docmt: Document) => {
         [key: string]: any;

package/dist/types/browser/utils/referenceXpath.d.ts

@@ -1,21 +1,21 @@
-export declare const findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: any) => any[] | undefined;
+export declare const findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: boolean, multiElementReferenceMode?: boolean) => any[] | undefined;
 declare const referenceXpath: {
-    findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: any) => any[] | undefined;
+    findRelativeXpath: (element1: HTMLElement | Element, element2: HTMLElement | Element, docmt: Document, xpaths1: any[], xpaths2: any[], isIndex: boolean, multiElementReferenceMode?: boolean) => any[] | undefined;
     getDescendantXpath: (refExpectElement: Array<HTMLElement | Element>, docmt: Document, xpaths1: {
         key: string;
         value: string;
     }[], xpaths2: {
         key: string;
         value: string;
-    }[], relation: "descendant" | "descedant-or-self", isIndex: boolean) => {
+    }[], relation: "descendant" | "descedant-or-self", isIndex?: boolean, multiElementReferenceMode?: boolean) => {
         key: string;
         value: string;
     }[] | undefined;
-    getXpathRelationExpression: (element1: HTMLElement | Element, element2: HTMLElement | Element, relation: string, xpath1: any[], xpath2: any[], isIndex: any) => {
+    getXpathRelationExpression: (element1: HTMLElement | Element, element2: HTMLElement | Element, relation: string, xpath1: any[], xpath2: any[], isIndex: boolean, multiElementReferenceMode: boolean) => {
         key: string;
         value: any;
     }[];
-    getTraverseXpathExpression: (xpathe1: string, absoluteXpathElements: any[], element2: HTMLElement | Element, refExpectElement: Array<HTMLElement | Element>, docmt: Node, relation: string, isIndex: any) => {
+    getTraverseXpathExpression: (xpathe1: string, absoluteXpathElements: string[], element2: HTMLElement | Element, refExpectElement: Array<HTMLElement | Element>, docmt: Node, relation: string, isIndex: boolean, multiElementReferenceMode: boolean) => {
         key: string;
         value: string;
     }[] | undefined;

package/dist/types/browser/utils/xpathHelpers.d.ts

@@ -1,4 +1,5 @@
 export declare const reWhiteSpace: RegExp;
+export declare let cspEnabled: boolean;
 export declare let modifiedElementAttributes: {
     url: string | null;
     attributeName: string | null;
@@ -12,7 +13,7 @@ export declare const isNumberExist: (str: string) => boolean;
 export declare const buildPattern: (pattern: string, isSvg: boolean, tagName: string) => string;
 export declare const getTextContent: (targetElement: HTMLElement | Element) => string;
 export declare const getFilteredText: (element: Node) => string;
-export declare const getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node) => number;
+export declare const getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node, multiElementReferenceMode?: boolean) => number;
 export declare const escapeCharacters: (text: string) => string;
 export declare const removeParenthesis: (xpath: string) => string;
 export declare const findXpathWithIndex: (val: string, node: HTMLElement | Element, docmt: Node, count: number) => string | undefined;
@@ -22,8 +23,7 @@ export declare const checkBlockedAttributes: (attribute: {
     name: string;
     value: string;
 }, targetElement: HTMLElement | Element, isTarget: boolean) => boolean;
-export declare const getRelationship: (a: HTMLElement, b: HTMLElement) => "" | "preceding" | "following" | "ancestor" | "descendant" | "self";
-export declare const findRoot: (node: Node) => Node;
+export declare const getRelationship: (a: HTMLElement, b: HTMLElement) => string;
 export declare const isSvg: (element: HTMLElement | Element) => element is SVGElement;
 export declare const replaceTempAttributes: (str: string) => string;
 export declare const getPropertyXPath: (element: HTMLElement | Element, docmt: Document, prop: string, value: string, isIndex: boolean, isTarget: boolean) => string | undefined;
@@ -45,11 +45,11 @@ export declare const getReferenceElementsXpath: (domNode: HTMLElement | Element,
     key: string;
     value: string;
 }[];
-export declare function parseXml(xmlStr: string): Document | null;
+export declare const parseXml: (xmlStr: string) => Document | null;
 export declare const normalizeXPath: (xpath: string) => string;
 export declare const findMatchingParenthesis: (text: string, openPos: number) => number;
 export declare const xpathUtils: {
-    parseXml: typeof parseXml;
+    parseXml: (xmlStr: string) => Document | null;
     getReferenceElementsXpath: (domNode: HTMLElement | Element, docmt: Document, isTarget: boolean) => {
         key: string;
         value: string;
@@ -63,7 +63,7 @@ export declare const xpathUtils: {
     findXpathWithIndex: (val: string, node: HTMLElement | Element, docmt: Node, count: number) => string | undefined;
     isNumberExist: (str: string) => boolean;
     getTextContent: (targetElement: HTMLElement | Element) => string;
-    getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node) => number;
+    getCountOfXPath: (xpath: string, element: HTMLElement | Element, docmt: Node, multiElementReferenceMode?: boolean) => number;
     normalizeXPath: (xpath: string) => string;
     getShadowRoot: (a: HTMLElement | Element) => Element | null;
     escapeCharacters: (text: string) => string;
@@ -72,7 +72,7 @@ export declare const xpathUtils: {
         name: string;
         value: string;
     }, targetElement: HTMLElement | Element, isTarget: boolean) => boolean;
-    getRelationship: (a: HTMLElement, b: HTMLElement) => "" | "preceding" | "following" | "ancestor" | "descendant" | "self";
+    getRelationship: (a: HTMLElement, b: HTMLElement) => string;
     findMatchingParenthesis: (text: string, openPos: number) => number;
     deleteGarbageFromInnerText: (a: string) => string;
     replaceTempAttributes: (str: string) => string;
@@ -85,4 +85,5 @@ export declare const xpathUtils: {
         element: HTMLElement | Element;
         doc: Document;
     }[];
+    cspEnabled: boolean;
 };

package/dist/xpath.mjs

@@ -46,8 +46,6 @@ async function createXPathAPI() {
         return {
             autoHeal: async (data, htmlString) => {
                 await page?.evaluate((datum, html) => {
-                    // let docmt = (window as any).XpathLib.parseXml(html);
-                    // return (window as any).XpathLib.getElementsFromHTML(datum, docmt);
                     // @ts-ignore
                     let xpathAPI = window.XpathLib.createXPathAPI();
                     let docmt = xpathAPI.xpathUtils.parseXml(html);

package/dist/xpath.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"xpath.mjs","sources":["../src/node/xpath.ts"],"sourcesContent":["import { fileURLToPath } from \"url\";\r\nimport path, { join } from \"path\";\r\nimport { readFileSync } from \"fs\";\r\nimport { ElementRecord } from \"../types/locator\";\r\n\r\nconst _filename = fileURLToPath(import.meta.url);\r\nconst _dirname = path.dirname(_filename);\r\n\r\nlet puppeteer: any;\r\n\r\nconst injectScriptPath = join(_dirname, \"index.cdn.js\");\r\nconst injectScript = readFileSync(injectScriptPath, \"utf-8\");\r\n\r\nasync function createXPathAPI() {\r\n  puppeteer = await import('puppeteer');\r\n\r\n  let browser = await puppeteer.launch({ headless: true });\r\n  let page = await browser.newPage();\r\n\r\n  const fromHTML = async (html: string) => {\r\n    await page?.setContent(html);\r\n    await page?.addScriptTag({ content: injectScript });\r\n\r\n    page?.on(\r\n      \"console\",\r\n      async (msg: { type: () => any; text: () => any; args: () => any }) => {\r\n        const type = msg.type();\r\n        const txt = msg.text();\r\n\r\n        const args = msg.args();\r\n        if (!args || args.length === 0) {\r\n          console.log(`[Browser:${type}]`, txt);\r\n          return;\r\n        }\r\n\r\n        for (let i = 0; i < args.length; i++) {\r\n          try {\r\n            const arg = args[i];\r\n            const obj = arg.remoteObject();\r\n\r\n            console.log(obj);\r\n\r\n            if (obj.value !== undefined) {\r\n              console.log(`[Browser:${type}]`, obj.value);\r\n            } else {\r\n              const value = await arg.jsonValue().catch(() => txt);\r\n              console.log(`[Browser:${type}]`, value);\r\n            }\r\n          } catch (err) {\r\n            console.log(`[Browser:${type}]`, txt);\r\n          }\r\n        }\r\n      }\r\n    );\r\n\r\n    page?.on(\"pageerror\", (msg: any) => {\r\n      console.log(\"error\", msg);\r\n    });\r\n\r\n    return {\r\n      autoHeal: async (data: ElementRecord, htmlString: string) => {\r\n        await page?.evaluate((datum: ElementRecord, html: string) => {\r\n          // let docmt = (window as any).XpathLib.parseXml(html);\r\n          // return (window as any).XpathLib.getElementsFromHTML(datum, docmt);\r\n          // @ts-ignore\r\n          let xpathAPI = window.XpathLib.createXPathAPI();\r\n          let docmt = xpathAPI.xpathUtils.parseXml(html);\r\n          return xpathAPI.getElementsFromHTML(datum, docmt);\r\n        }, data, htmlString);\r\n      },\r\n    };\r\n  };\r\n\r\n  return { fromHTML, browser };\r\n}\r\n\r\nexport default createXPathAPI;\r\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"xpath.mjs","sources":["../src/node/xpath.ts"],"sourcesContent":["import { fileURLToPath } from \"url\";\r\nimport path, { join } from \"path\";\r\nimport { readFileSync } from \"fs\";\r\nimport { ElementRecord } from \"../types/locator\";\r\n\r\nconst _filename = fileURLToPath(import.meta.url);\r\nconst _dirname = path.dirname(_filename);\r\n\r\nlet puppeteer: any;\r\n\r\nconst injectScriptPath = join(_dirname, \"index.cdn.js\");\r\nconst injectScript = readFileSync(injectScriptPath, \"utf-8\");\r\n\r\nasync function createXPathAPI() {\r\n  puppeteer = await import('puppeteer');\r\n\r\n  let browser = await puppeteer.launch({ headless: true });\r\n  let page = await browser.newPage();\r\n\r\n  const fromHTML = async (html: string) => {\r\n    await page?.setContent(html);\r\n    await page?.addScriptTag({ content: injectScript });\r\n\r\n    page?.on(\r\n      \"console\",\r\n      async (msg: { type: () => any; text: () => any; args: () => any }) => {\r\n        const type = msg.type();\r\n        const txt = msg.text();\r\n\r\n        const args = msg.args();\r\n        if (!args || args.length === 0) {\r\n          console.log(`[Browser:${type}]`, txt);\r\n          return;\r\n        }\r\n\r\n        for (let i = 0; i < args.length; i++) {\r\n          try {\r\n            const arg = args[i];\r\n            const obj = arg.remoteObject();\r\n\r\n            console.log(obj);\r\n\r\n            if (obj.value !== undefined) {\r\n              console.log(`[Browser:${type}]`, obj.value);\r\n            } else {\r\n              const value = await arg.jsonValue().catch(() => txt);\r\n              console.log(`[Browser:${type}]`, value);\r\n            }\r\n          } catch (err) {\r\n            console.log(`[Browser:${type}]`, txt);\r\n          }\r\n        }\r\n      }\r\n    );\r\n\r\n    page?.on(\"pageerror\", (msg: any) => {\r\n      console.log(\"error\", msg);\r\n    });\r\n\r\n    return {\r\n      autoHeal: async (data: ElementRecord, htmlString: string) => {\r\n        await page?.evaluate((datum: ElementRecord, html: string) => {\r\n          // @ts-ignore\r\n          let xpathAPI = window.XpathLib.createXPathAPI();\r\n          let docmt = xpathAPI.xpathUtils.parseXml(html);\r\n          return xpathAPI.getElementsFromHTML(datum, docmt);\r\n        }, data, htmlString);\r\n      },\r\n    };\r\n  };\r\n\r\n  return { fromHTML, browser };\r\n}\r\n\r\nexport default createXPathAPI;\r\n"],"names":[],"mappings":";;;;AAKA,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;AAExC,IAAI,SAAc;AAElB,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC;AACvD,MAAM,YAAY,GAAG,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC;AAE5D,eAAe,cAAc,GAAA;AAC3B,IAAA,SAAS,GAAG,MAAM,OAAO,WAAW,CAAC;AAErC,IAAA,IAAI,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AACxD,IAAA,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE;AAElC,IAAA,MAAM,QAAQ,GAAG,OAAO,IAAY,KAAI;AACtC,QAAA,MAAM,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;QAC5B,MAAM,IAAI,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAEnD,IAAI,EAAE,EAAE,CACN,SAAS,EACT,OAAO,GAA0D,KAAI;AACnE,YAAA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE;AACvB,YAAA,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE;AAEtB,YAAA,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE;YACvB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,OAAO,CAAC,GAAG,CAAC,CAAA,SAAA,EAAY,IAAI,CAAA,CAAA,CAAG,EAAE,GAAG,CAAC;gBACrC;YACF;AAEA,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACpC,gBAAA,IAAI;AACF,oBAAA,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC;AACnB,oBAAA,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,EAAE;AAE9B,oBAAA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;AAEhB,oBAAA,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC3B,OAAO,CAAC,GAAG,CAAC,CAAA,SAAA,EAAY,IAAI,CAAA,CAAA,CAAG,EAAE,GAAG,CAAC,KAAK,CAAC;oBAC7C;yBAAO;AACL,wBAAA,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;wBACpD,OAAO,CAAC,GAAG,CAAC,CAAA,SAAA,EAAY,IAAI,CAAA,CAAA,CAAG,EAAE,KAAK,CAAC;oBACzC;gBACF;gBAAE,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,GAAG,CAAC,CAAA,SAAA,EAAY,IAAI,CAAA,CAAA,CAAG,EAAE,GAAG,CAAC;gBACvC;YACF;AACF,QAAA,CAAC,CACF;QAED,IAAI,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC,GAAQ,KAAI;AACjC,YAAA,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC;AAC3B,QAAA,CAAC,CAAC;QAEF,OAAO;AACL,YAAA,QAAQ,EAAE,OAAO,IAAmB,EAAE,UAAkB,KAAI;gBAC1D,MAAM,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAoB,EAAE,IAAY,KAAI;;oBAE1D,IAAI,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE;oBAC/C,IAAI,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAC9C,OAAO,QAAQ,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC;AACnD,gBAAA,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC;YACtB,CAAC;SACF;AACH,IAAA,CAAC;AAED,IAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;AAC9B;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ff-dom",
-    "version": "1.0.18-beta.1",
+    "version": "1.0.18-beta.3",
     "description": "",
     "type": "module",
     "files": [