ff-dom 1.0.18-beta.6 → 2.0.0

package/dist/index.cdn.js

@@ -868,9 +868,9 @@
         }
         return xpaths1;
     };
-    const parseXml = (xmlStr) => {
+    const parseXml = (xmlStr, type) => {
         if (window.DOMParser) {
-            return new window.DOMParser().parseFromString(xmlStr, "text/xml");
+            return new window.DOMParser().parseFromString(xmlStr, type);
         }
         return null;
     };
@@ -2188,10 +2188,27 @@
         getReferenceElementXpath,
     };
 
-    const getElementFromShadowRoot = (element, selector) => {
-        const shadowRoot = element.shadowRoot;
-        if (shadowRoot && !selector.includes("dynamic")) {
-            return shadowRoot.querySelector(selector);
+    const getElementFromShadowRoot = (el, selector) => {
+        // const shadowRoot = (element as HTMLElement).shadowRoot;
+        // if (shadowRoot && !selector.includes("dynamic")) {
+        //   return shadowRoot.querySelector(selector);
+        // }
+        const elements = Array.from(el.querySelectorAll('*'));
+        try {
+            for (let i = 0; i < elements.length; i++) {
+                if (elements[i].shadowRoot) {
+                    const { shadowRoot } = elements[i];
+                    if (shadowRoot) {
+                        getElementFromShadowRoot(shadowRoot, selector);
+                        if (shadowRoot && !selector.includes("dynamic")) {
+                            return shadowRoot.querySelector(selector);
+                        }
+                    }
+                }
+            }
+        }
+        catch (error) {
+            console.log(error);
         }
         return null;
     };
@@ -2225,30 +2242,27 @@
         "/preceding",
         "/following",
     ];
-    function getElementFromXPath(tempDiv, xpath) {
-        let currentElement = tempDiv;
-        const window = currentElement.ownerDocument.defaultView;
+    function getElementFromXPath(docmt, xpath) {
+        const window = docmt.defaultView;
         if (!window)
             return null;
         const xpathEvaluator = new window.XPathEvaluator();
-        const xpathResult = xpathEvaluator.evaluate(xpath, currentElement.ownerDocument, //here even tempDiv can be passed
-        null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+        const xpathResult = xpathEvaluator.evaluate(xpath, docmt, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
         return xpathResult.singleNodeValue;
     }
-    function checkReferenceElementIsValid(locator, relation, tempDiv) {
+    function checkReferenceElementIsValid(locator, relation, docmt) {
         if (locator.includes(relation)) {
             const locatotSplitArray = locator.split(relation);
             const sourceLoc = locatotSplitArray[0].trim();
-            let currentElement = tempDiv;
-            const window = currentElement.ownerDocument.defaultView;
+            const window = docmt.defaultView;
             if (!window)
                 return null;
             if (!locator.includes("dynamic")) {
                 const xpathEvaluator = new window.XPathEvaluator();
-                const xpathResult = xpathEvaluator.evaluate(sourceLoc, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+                const xpathResult = xpathEvaluator.evaluate(sourceLoc, docmt, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
                 const sourceElement = xpathResult.singleNodeValue;
                 if (sourceElement) {
-                    const xpathResultComplete = xpathEvaluator.evaluate(locator, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+                    const xpathResultComplete = xpathEvaluator.evaluate(locator, docmt, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
                     const completeElement = xpathResultComplete.singleNodeValue;
                     let relativeXpath;
                     if (completeElement) {
@@ -2269,16 +2283,12 @@
         return null;
     }
     const getElementsFromHTML = (record, docmt) => {
-        const document = docmt;
-        // global.SVGElement = document.defaultView?.SVGElement!;
-        const tempDiv = document.createElement("div");
-        const elementsToRemove = document.querySelectorAll("script, style, link[rel='stylesheet'], meta, noscript, embed, object, param, source, svg");
+        const elementsToRemove = docmt.querySelectorAll("script, style, link[rel='stylesheet'], meta, noscript, embed, object, param, source, svg");
         if (elementsToRemove) {
             elementsToRemove.forEach((tag) => {
                 tag.remove();
             });
         }
-        tempDiv.innerHTML = document.body?.innerHTML;
         const finalLocatorsSet = new Set();
         let finalLocators = [];
         function createLocator(base, overrides = {}) {
@@ -2352,135 +2362,126 @@
                 if (record.isShared.includes("Y")) {
                     break locators;
                 }
-                for (const relation of relations) {
-                    try {
-                        let targetElement = null;
-                        if (locator.value.startsWith("iframe")) {
-                            const iframe = tempDiv.querySelector(locator.value);
-                            if (iframe) {
-                                const iframeDocument = iframe.contentDocument || iframe.contentWindow?.document;
-                                if (iframeDocument) {
-                                    targetElement = iframeDocument.querySelector(locator.value.slice(6));
-                                }
+                try {
+                    let targetElement = null;
+                    if (locator.value.startsWith("iframe")) {
+                        const iframe = docmt.querySelector(locator.value);
+                        if (iframe) {
+                            const iframeDocument = iframe.contentDocument || iframe.contentWindow?.document;
+                            if (iframeDocument) {
+                                targetElement = iframeDocument.querySelector(locator.value.slice(6));
                             }
                         }
-                        else {
-                            const selectors = locator.value.split(">>>"); // Custom delimiter for shadow DOM
-                            let currentElement = tempDiv;
-                            for (const selector of selectors) {
-                                if (currentElement) {
-                                    const trimmedSelector = selector.trim();
-                                    if (locator.name.includes("id") ||
-                                        trimmedSelector.startsWith("#")) {
-                                        targetElement = currentElement.querySelector("#" + trimmedSelector);
-                                    }
-                                    else if (locator.name.includes("className") ||
-                                        trimmedSelector.startsWith(".")) {
-                                        targetElement = currentElement.querySelector("." + trimmedSelector);
-                                    }
-                                    else if ((locator.name.includes("xpath") ||
-                                        trimmedSelector.startsWith("//")) &&
-                                        !locator.type.match("dynamic")) {
-                                        if (tempDiv?.innerHTML) {
-                                            const normalizedXPath = normalizeXPath(trimmedSelector);
-                                            targetElement = getElementFromXPath(tempDiv, normalizedXPath);
-                                            if (targetElement) {
-                                                createLocator(locator, {
-                                                    value: trimmedSelector,
-                                                    isRecorded: String(locator.isRecorded).includes("N")
-                                                        ? "N"
-                                                        : "Y",
-                                                });
-                                            }
-                                        }
-                                    }
-                                    else {
-                                        targetElement = currentElement.querySelector(trimmedSelector);
-                                        if (!targetElement) {
-                                            targetElement = getElementFromShadowRoot(currentElement, trimmedSelector);
-                                        }
-                                    }
-                                    if (!targetElement &&
-                                        isSvg(currentElement) &&
-                                        !locator.type.match("dynamic")) {
-                                        targetElement = currentElement.querySelector(trimmedSelector);
+                    }
+                    else {
+                        const selectors = locator.value.split(">>>"); // Custom delimiter for shadow DOM
+                        for (const selector of selectors) {
+                            if (docmt) {
+                                const trimmedSelector = selector.trim();
+                                if (locator.name.includes("id") ||
+                                    trimmedSelector.startsWith("#")) {
+                                    targetElement = docmt.querySelector("#" + trimmedSelector);
+                                }
+                                else if (locator.name.includes("className") ||
+                                    trimmedSelector.startsWith(".")) {
+                                    targetElement = docmt.querySelector("." + trimmedSelector);
+                                }
+                                else if ((locator.name.includes("xpath") ||
+                                    trimmedSelector.startsWith("//")) &&
+                                    !locator.type.match("dynamic")) {
+                                    const normalizedXPath = normalizeXPath(trimmedSelector);
+                                    targetElement = getElementFromXPath(docmt, normalizedXPath);
+                                    if (targetElement) {
+                                        createLocator(locator, {
+                                            value: trimmedSelector,
+                                            isRecorded: String(locator.isRecorded).includes("N")
+                                                ? "N"
+                                                : "Y",
+                                        });
                                     }
-                                    currentElement = targetElement;
                                 }
                                 else {
-                                    console.error("Element not found at:", selector);
-                                    break;
+                                    targetElement = docmt.querySelector(trimmedSelector);
+                                    if (!targetElement) {
+                                        targetElement = getElementFromShadowRoot(docmt.body, trimmedSelector);
+                                    }
                                 }
                             }
+                            else {
+                                console.error("Element not found at:", selector);
+                                break;
+                            }
                         }
-                        const locatorExists = (name, value) => {
-                            const key = `${name}:${value}`;
-                            return finalLocatorsSet.has(key);
-                        };
-                        if (targetElement) {
-                            const idValue = getId(targetElement);
-                            if (idValue && !locatorExists("id", idValue)) {
-                                record.locators.forEach((loc) => {
-                                    createLocator(loc, {
-                                        name: "id",
-                                        value: idValue,
-                                        isRecorded: loc.value === idValue && loc.name === "id"
-                                            ? loc.isRecorded
-                                            : "Y",
-                                        isSelfHealed: loc.value === idValue && loc.name === "id"
-                                            ? loc.isSelfHealed
-                                            : "Y",
-                                    });
+                    }
+                    const locatorExists = (name, value) => {
+                        const key = `${name}:${value}`;
+                        return finalLocatorsSet.has(key);
+                    };
+                    if (targetElement) {
+                        const idValue = getId(targetElement);
+                        if (idValue && !locatorExists("id", idValue)) {
+                            record.locators.forEach((loc) => {
+                                createLocator(loc, {
+                                    name: "id",
+                                    value: idValue,
+                                    isRecorded: loc.value === idValue && loc.name === "id"
+                                        ? loc.isRecorded
+                                        : "Y",
+                                    isSelfHealed: loc.value === idValue && loc.name === "id"
+                                        ? loc.isSelfHealed
+                                        : "Y",
                                 });
-                            }
-                            const textValue = getVisibleText(targetElement);
-                            if (textValue) {
-                                record.locators.forEach((loc) => {
-                                    createLocator(loc, {
-                                        name: "linkText",
-                                        type: "static",
-                                        value: textValue,
-                                        isRecorded: loc.value === textValue ? loc.isRecorded : "Y",
-                                        isSelfHealed: loc.value === textValue ? loc.isSelfHealed : "Y",
-                                    });
+                            });
+                        }
+                        const textValue = getVisibleText(targetElement);
+                        if (textValue) {
+                            record.locators.forEach((loc) => {
+                                createLocator(loc, {
+                                    name: "linkText",
+                                    type: "static",
+                                    value: textValue,
+                                    isRecorded: loc.value === textValue ? loc.isRecorded : "Y",
+                                    isSelfHealed: loc.value === textValue ? loc.isSelfHealed : "Y",
                                 });
-                            }
-                            const nameLocator = getName(targetElement);
-                            if (nameLocator && !locatorExists("name", nameLocator)) {
-                                record.locators.forEach((loc) => {
-                                    createLocator(loc, {
-                                        name: "name",
-                                        type: "static",
-                                        value: nameLocator,
-                                        isRecorded: loc.value === nameLocator && loc.name === "name"
-                                            ? loc.isRecorded
-                                            : "Y",
-                                        isSelfHealed: loc.value === nameLocator && loc.name === "name"
-                                            ? loc.isSelfHealed
-                                            : "Y",
-                                    });
+                            });
+                        }
+                        const nameLocator = getName(targetElement);
+                        if (nameLocator && !locatorExists("name", nameLocator)) {
+                            record.locators.forEach((loc) => {
+                                createLocator(loc, {
+                                    name: "name",
+                                    type: "static",
+                                    value: nameLocator,
+                                    isRecorded: loc.value === nameLocator && loc.name === "name"
+                                        ? loc.isRecorded
+                                        : "Y",
+                                    isSelfHealed: loc.value === nameLocator && loc.name === "name"
+                                        ? loc.isSelfHealed
+                                        : "Y",
                                 });
-                            }
-                            const classValue = getClassName(targetElement);
-                            if (classValue &&
-                                classValue.trim() !== "" &&
-                                !locatorExists("className", classValue)) {
-                                record.locators.forEach((loc) => {
-                                    createLocator(loc, {
-                                        name: "className",
-                                        value: classValue,
-                                        isRecorded: loc.value === classValue && loc.name === "className"
-                                            ? loc.isRecorded
-                                            : "Y",
-                                        isSelfHealed: loc.value === classValue && loc.name === "className"
-                                            ? loc.isSelfHealed
-                                            : "Y",
-                                    });
+                            });
+                        }
+                        const classValue = getClassName(targetElement);
+                        if (classValue &&
+                            classValue.trim() !== "" &&
+                            !locatorExists("className", classValue)) {
+                            record.locators.forEach((loc) => {
+                                createLocator(loc, {
+                                    name: "className",
+                                    value: classValue,
+                                    isRecorded: loc.value === classValue && loc.name === "className"
+                                        ? loc.isRecorded
+                                        : "Y",
+                                    isSelfHealed: loc.value === classValue && loc.name === "className"
+                                        ? loc.isSelfHealed
+                                        : "Y",
                                 });
-                            }
-                            const xpathResults = parseDOM(targetElement, document, false, true);
-                            xpathResults.forEach((result) => {
-                                const fnValue = result.value;
+                            });
+                        }
+                        const xpathResults = parseDOM(targetElement, docmt, false, true);
+                        xpathResults.forEach((result) => {
+                            const fnValue = result.value;
+                            if (fnValue && !locatorExists(result.key.replace('xpath by', '').trim(), fnValue)) {
                                 record.locators.forEach((loc) => {
                                     createLocator(loc, {
                                         name: 'xpath',
@@ -2489,71 +2490,71 @@
                                         isSelfHealed: loc.value === fnValue ? loc.isSelfHealed : 'Y',
                                     });
                                 });
-                            });
-                            for (const locator of record.locators) {
-                                try {
-                                    for (const loc of record.locators) {
-                                        if (!loc.value)
-                                            continue;
-                                        for (const relation of relations) {
-                                            if (loc.value.includes(relation)) {
-                                                const relativeXpath = checkReferenceElementIsValid(loc.value, relation, tempDiv);
-                                                if (relativeXpath) {
-                                                    createLocator(loc, {
-                                                        name: "xpath",
-                                                        value: relativeXpath,
-                                                        isRecorded: locator.isRecorded !== "" &&
-                                                            locator.isRecorded !== null
-                                                            ? locator.isRecorded
-                                                            : "Y",
-                                                    });
-                                                    break;
-                                                }
+                            }
+                        });
+                        for (const locator of record.locators) {
+                            try {
+                                for (const loc of record.locators) {
+                                    if (!loc.value)
+                                        continue;
+                                    for (const relation of relations) {
+                                        if (loc.value.includes(relation)) {
+                                            const relativeXpath = checkReferenceElementIsValid(loc.value, relation, docmt);
+                                            if (relativeXpath) {
+                                                createLocator(loc, {
+                                                    name: "xpath",
+                                                    value: relativeXpath,
+                                                    isRecorded: locator.isRecorded !== "" &&
+                                                        locator.isRecorded !== null
+                                                        ? locator.isRecorded
+                                                        : "Y",
+                                                });
+                                                break;
                                             }
                                         }
                                     }
                                 }
-                                catch (error) {
-                                    console.error("Error processing locator:", locator, error);
-                                }
                             }
-                            const finalAutoHealedLocators = finalLocators.map((obj) => ({
-                                ...obj,
-                                value: cleanLocatorValue(obj.value, obj.name, obj.isRecorded),
-                            }));
-                            const finalUniqueAutoHealedLocators = finalAutoHealedLocators.reduce((unique, locator) => {
-                                if (locator.value &&
-                                    !unique.some((l) => l.value === locator.value)) {
-                                    unique.push(locator);
-                                }
-                                return unique;
-                            }, []);
-                            const jsonResult = [
-                                {
-                                    name: `${record.name}`,
-                                    desc: `${record.desc}`,
-                                    type: `${record.type}`,
-                                    locators: finalUniqueAutoHealedLocators.filter((locator) => locator?.value != null && locator.value !== ""),
-                                    isShared: `${record.isShared}`,
-                                    projectId: `${record.projectId}`,
-                                    projectType: `${record.projectType}`,
-                                    isRecorded: `${record.isRecorded}`,
-                                    folder: `${record.folder}`,
-                                    parentId: `${record.parentId}`,
-                                    parentName: `${record.parentName}`,
-                                    platform: `${record.platform}`,
-                                    licenseId: `${record.licenseId}`,
-                                    licenseType: `${record.licenseType}`,
-                                    userId: `${record.userId}`,
-                                },
-                            ];
-                            return jsonResult;
+                            catch (error) {
+                                console.error("Error processing locator:", locator, error);
+                            }
                         }
+                        const finalAutoHealedLocators = finalLocators.map((obj) => ({
+                            ...obj,
+                            value: cleanLocatorValue(obj.value, obj.name, obj.isRecorded),
+                        }));
+                        const finalUniqueAutoHealedLocators = finalAutoHealedLocators.reduce((unique, locator) => {
+                            if (locator.value &&
+                                !unique.some((l) => l.value === locator.value)) {
+                                unique.push(locator);
+                            }
+                            return unique;
+                        }, []);
+                        const jsonResult = [
+                            {
+                                name: `${record.name}`,
+                                desc: `${record.desc}`,
+                                type: `${record.type}`,
+                                locators: finalUniqueAutoHealedLocators.filter((locator) => locator?.value != null && locator.value !== ""),
+                                isShared: `${record.isShared}`,
+                                projectId: `${record.projectId}`,
+                                projectType: `${record.projectType}`,
+                                isRecorded: `${record.isRecorded}`,
+                                folder: `${record.folder}`,
+                                parentId: `${record.parentId}`,
+                                parentName: `${record.parentName}`,
+                                platform: `${record.platform}`,
+                                licenseId: `${record.licenseId}`,
+                                licenseType: `${record.licenseType}`,
+                                userId: `${record.userId}`,
+                            },
+                        ];
+                        return jsonResult;
                     }
-                    catch (error) {
-                        console.error("Error processing locator:", locator, error);
-                        continue;
-                    }
+                }
+                catch (error) {
+                    console.error("Error processing locator:", locator, error);
+                    continue;
                 }
             }
             catch (error) {

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

@@ -45,7 +45,7 @@ export declare const createXPathAPI: () => {
         }[];
     };
     xpathUtils: {
-        parseXml: (xmlStr: string) => Document | null;
+        parseXml: (xmlStr: string, type: DOMParserSupportedType) => Document | null;
         getReferenceElementsXpath: (domNode: HTMLElement | Element, docmt: Document, isTarget: boolean) => {
             key: string;
             value: string;

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

@@ -45,11 +45,11 @@ export declare const getReferenceElementsXpath: (domNode: HTMLElement | Element,
     key: string;
     value: string;
 }[];
-export declare const parseXml: (xmlStr: string) => Document | null;
+export declare const parseXml: (xmlStr: string, type: DOMParserSupportedType) => Document | null;
 export declare const normalizeXPath: (xpath: string) => string;
 export declare const findMatchingParenthesis: (text: string, openPos: number) => number;
 export declare const xpathUtils: {
-    parseXml: (xmlStr: string) => Document | null;
+    parseXml: (xmlStr: string, type: DOMParserSupportedType) => Document | null;
     getReferenceElementsXpath: (domNode: HTMLElement | Element, docmt: Document, isTarget: boolean) => {
         key: string;
         value: string;

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

@@ -1,7 +1,7 @@
 import { ElementRecord } from "../types/locator";
 declare function createXPathAPI(): Promise<{
     fromHTML: (html: string) => Promise<{
-        autoHeal: (data: ElementRecord, htmlString: string) => Promise<void>;
+        autoHeal: (data: ElementRecord, htmlString: string) => Promise<any>;
     }>;
     browser: any;
 }>;

package/dist/xpath.mjs

@@ -12,7 +12,7 @@ async function createXPathAPI() {
     let browser = await puppeteer.launch({ headless: true });
     let page = await browser.newPage();
     const fromHTML = async (html) => {
-        await page?.setContent(html);
+        await page?.setContent(html.replace(/\\n/g, '').replaceAll(/\\t/g, '').replace(/\\"/g, '"'), { waitUntil: 'domcontentloaded' });
         await page?.addScriptTag({ content: injectScript });
         page?.on("console", async (msg) => {
             const type = msg.type();
@@ -45,12 +45,13 @@ async function createXPathAPI() {
         });
         return {
             autoHeal: async (data, htmlString) => {
-                await page?.evaluate((datum, html) => {
+                return await page?.evaluate((datum) => {
                     // @ts-ignore
                     let xpathAPI = window.XpathLib.createXPathAPI();
-                    let docmt = xpathAPI.xpathUtils.parseXml(html);
-                    return xpathAPI.getElementsFromHTML(datum, docmt);
-                }, data, htmlString);
+                    let xpaths = xpathAPI.getElementsFromHTML(datum, document);
+                    // console.log(xpaths);
+                    return xpaths;
+                }, data);
             },
         };
     };

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          // @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.replace(/\\\\n/g, '').replaceAll(/\\\\t/g, '').replace(/\\\\\"/g, '\"'), { waitUntil: 'domcontentloaded' });\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        return await page?.evaluate((datum: ElementRecord) => {\r\n          // @ts-ignore\r\n          let xpathAPI = window.XpathLib.createXPathAPI();\r\n          let xpaths = xpathAPI.getElementsFromHTML(datum, document);\r\n          // console.log(xpaths);\r\n          return xpaths;\r\n        }, data);\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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"}

package/package.json

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

package/src/node/xpath.ts

@@ -18,7 +18,7 @@ async function createXPathAPI() {
   let page = await browser.newPage();
 
   const fromHTML = async (html: string) => {
-    await page?.setContent(html);
+    await page?.setContent(html.replace(/\\n/g, '').replaceAll(/\\t/g, '').replace(/\\"/g, '"'), { waitUntil: 'domcontentloaded' });
     await page?.addScriptTag({ content: injectScript });
 
     page?.on(
@@ -59,12 +59,13 @@ async function createXPathAPI() {
 
     return {
       autoHeal: async (data: ElementRecord, htmlString: string) => {
-        await page?.evaluate((datum: ElementRecord, html: string) => {
+        return await page?.evaluate((datum: ElementRecord) => {
           // @ts-ignore
           let xpathAPI = window.XpathLib.createXPathAPI();
-          let docmt = xpathAPI.xpathUtils.parseXml(html);
-          return xpathAPI.getElementsFromHTML(datum, docmt);
-        }, data, htmlString);
+          let xpaths = xpathAPI.getElementsFromHTML(datum, document);
+          // console.log(xpaths);
+          return xpaths;
+        }, data);
       },
     };
   };