ff-automationv2 2.2.28 → 2.2.30

package/dist/domAnalysis/simplifyAndFlatten.js

@@ -48,7 +48,7 @@ class DomSimplifier {
             if (!tag || tag === "meta")
                 return;
             const attribs = el.attribs ?? {};
-            if (tag !== "select" && tag !== "option") {
+            if (tag !== "select" && tag !== "option" && tag !== "mat-select" && tag !== "mat-option") {
                 if ((attribs["element-visibility"] === "hidden" ||
                     attribs["element-covered"] === "true")) {
                     return;
@@ -70,9 +70,7 @@ class DomSimplifier {
                         directText += txt;
                 }
             });
-            const cleanText = directText
-                .replace(/[^a-zA-Z0-9\s]/g, " ")
-                .trim();
+            const cleanText = directText.trim();
             if (cleanText)
                 simplified["text"] = cleanText.slice(0, 200);
             // -----------------
@@ -82,7 +80,7 @@ class DomSimplifier {
                 "style", "onclick", "onchange", "href",
                 "oninput", "onmouseover", "onfocus",
                 "ff-inspect", "element-visibility",
-                "element-pointer-events", "element-zindex", "element-covered"
+                "element-pointer-events", "element-zindex", "element-covered", "width", "height"
             ]);
             Object.entries(attribs).forEach(([key, val]) => {
                 if (!EXCLUDED_ATTRS.has(key.toLowerCase())) {
@@ -94,7 +92,11 @@ class DomSimplifier {
             // -----------------
             const parts = new Set();
             if (cleanText && cleanText.length <= 70) {
-                parts.add(cleanText.toLowerCase());
+                // parts.add(cleanText.toLowerCase().replace(/\s+/g, ""));
+                parts.add(cleanText
+                    .toLowerCase()
+                    .replace(/[^a-zA-Z0-9\s]/g, " ")
+                    .replace(/\s+/g, " "));
             }
             const SEARCH_EXCLUDED = new Set([
                 "class", "style", "onclick", "onchange",
@@ -113,7 +115,7 @@ class DomSimplifier {
                     .trim()
                     .toLowerCase();
                 if (v)
-                    parts.add(v);
+                    parts.add(v.replace(/\s+/g, ""));
             });
             simplified["search"] = Array.from(parts).join(" ").trim();
             flatNodes.push({
@@ -123,7 +125,7 @@ class DomSimplifier {
         });
         return flatNodes;
     }
-    simplifyMobile(rawDom) {
+    simplifyAndroidDom(rawDom, stepAction, step) {
         const parser = new xmldom_1.DOMParser();
         const xmlDoc = parser.parseFromString(rawDom, "text/xml");
         const root = xmlDoc.documentElement;
@@ -181,7 +183,7 @@ class DomSimplifier {
             }
             const searchParts = [];
             if (simplified.text && simplified.text.trim()) {
-                searchParts.push(simplified.text);
+                searchParts.push(simplified.text.replace(/\s+/g, ""));
             }
             for (const key of [
                 "content-desc",
@@ -191,33 +193,126 @@ class DomSimplifier {
             ]) {
                 const val = simplified[key];
                 if (val && typeof val === "string" && val.trim()) {
-                    searchParts.push(val);
+                    searchParts.push(val.replace(/\s+/g, ""));
                 }
             }
             simplified["search"] = searchParts.join(" ").trim().toLowerCase();
-            if (!skipNode) {
+            if (stepAction === "verify" && (step.toLowerCase().includes("disable") || step.toLowerCase().includes("disabled"))) {
                 flatNodes.push({
                     node: simplified,
                     search: simplified["search"],
                     element: node._element
                 });
             }
-            const children = [];
-            for (const child of node.children || []) {
-                const simplifiedChild = simplifyAndFlatten(child);
-                if (simplifiedChild && simplifiedChild.enabled !== "false") {
-                    children.push(simplifiedChild);
+            else {
+                if (!skipNode) {
+                    flatNodes.push({
+                        node: simplified,
+                        search: simplified["search"],
+                        element: node._element
+                    });
                 }
             }
-            if (children.length) {
-                simplified["children"] = children;
+            for (const child of node.children || []) {
+                simplifyAndFlatten(child);
             }
-            return simplified;
         }
         simplifyAndFlatten(xmlTree);
         return {
             flatNodes, parentMap
         };
     }
+    async simplifyIosDom(rawDom, driver) {
+        const { width: screenWidth, height: screenHeight } = await driver.getWindowSize();
+        const parser = new xmldom_1.DOMParser();
+        const xmlDoc = parser.parseFromString(rawDom, "text/xml");
+        const root = xmlDoc.documentElement;
+        const flatNodes = [];
+        const runtimeElements = {};
+        const parentMap = new Map();
+        function xmlToTree(elem) {
+            const children = [];
+            for (let i = 0; i < elem.childNodes.length; i++) {
+                const child = elem.childNodes[i];
+                if (child.nodeType === 1) {
+                    const childElement = child;
+                    // store parent relationship
+                    parentMap.set(childElement, elem);
+                    children.push(xmlToTree(childElement));
+                }
+            }
+            const attributes = {};
+            for (let i = 0; i < elem.attributes.length; i++) {
+                const attr = elem.attributes[i];
+                attributes[attr.name] = attr.value;
+            }
+            return {
+                tag: elem.tagName,
+                attributes,
+                text: (elem.textContent || "").trim(),
+                _element: elem,
+                children
+            };
+        }
+        const xmlTree = xmlToTree(root);
+        function isOnScreen(x, y, w, h) {
+            return ((x + w) > 0 && x < screenWidth &&
+                (y + h) > 0 && y < screenHeight);
+        }
+        function simplifyAndFlatten(node) {
+            const attrs = node.attributes || {};
+            const x = parseInt(attrs["x"] || "0");
+            const y = parseInt(attrs["y"] || "0");
+            const w = parseInt(attrs["width"] || "0");
+            const h = parseInt(attrs["height"] || "0");
+            const skipNode = attrs["enabled"] === "false" ||
+                attrs["traits"] === "PlaysSound, KeyboardKey" ||
+                !isOnScreen(x, y, w, h);
+            const simplified = {};
+            simplified["tag"] = node.tag;
+            simplified["class"] = node.tag;
+            if (attrs["FF-inspecter"]) {
+                simplified["FF-inspecter"] = attrs["FF-inspecter"];
+            }
+            simplified["value"] = attrs["value"] || "";
+            const importantAttrs = [
+                "label", "name", "class", "accessible", "enabled", "traits"
+            ];
+            for (const attr of importantAttrs) {
+                if (attrs[attr]) {
+                    simplified[attr] = attrs[attr];
+                }
+            }
+            const searchParts = [];
+            if (simplified["value"]?.trim()) {
+                searchParts.push(simplified["value"].replace(/\s+/g, ""));
+            }
+            for (const key of ["name", "label"]) {
+                const val = simplified[key];
+                if (val?.trim()) {
+                    searchParts.push(val.replace(/\s+/g, ""));
+                }
+            }
+            simplified["search"] = searchParts.join(" ").toLowerCase();
+            if (!skipNode) {
+                const id = flatNodes.length;
+                flatNodes.push({
+                    node: simplified,
+                    search: simplified["search"],
+                    element: node._element
+                });
+                runtimeElements[id] = node._element;
+            }
+            for (const child of node.children || []) {
+                simplifyAndFlatten(child);
+            }
+        }
+        simplifyAndFlatten(xmlTree);
+        return {
+            flatNodes,
+            parentMap,
+            runtimeElements
+        };
+    }
 }
 exports.DomSimplifier = DomSimplifier;

package/dist/fireflinkData/fireflinkLocators/getListOfLocators.d.ts

@@ -1,3 +1,6 @@
+import { LocatorWorkerPool } from "../../utils/workers/LocatorWorkerPool.js";
 export declare class ElementGetter {
+    private readonly workerPool;
+    constructor(workerPool: LocatorWorkerPool);
     getFireFlinkElement(html: string, attribute: string): Promise<any>;
 }

package/dist/fireflinkData/fireflinkLocators/getListOfLocators.js

@@ -2,24 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementGetter = void 0;
 const logData_js_1 = require("../../utils/logger/logData.js");
-const elementsFromHTML_js_1 = require("./elementsFromHTML.js");
+// import { getAiElementsFromHTML } from "./parser/getElementsFromHTML.js";
+const platformContext_js_1 = require("../../utils/helpers/platformContext.js");
 class ElementGetter {
+    constructor(workerPool) {
+        this.workerPool = workerPool;
+    }
     async getFireFlinkElement(html, attribute) {
-        const formattedAttribute = attribute.replace('[', '//*[@');
+        const platform = (0, platformContext_js_1.getPlatform)();
+        // const formattedAttribute = attribute.replace('[', '//*[@');
         try {
-            const result = (0, elementsFromHTML_js_1.getElementsFromHTML)([
-                {
-                    name: "xpath",
-                    type: "Static",
-                    value: formattedAttribute,
-                    reference: "local",
-                    status: "NOT_USED",
-                    isRecorded: "Y",
-                }
-            ], html);
+            const result = await this.workerPool.getFireFlinkElement(html, attribute, platform);
+            // logger.info("formattedAttribute", formattedAttribute);
+            // const result = await getFireFlinkElement(
+            //     {
+            //         locators: [
+            //             {
+            //                 name: "xpath",
+            //                 type: "Static",
+            //                 value: formattedAttribute,
+            //                 reference: "local",
+            //                 status: "NOT_USED",
+            //                 isRecorded: "N",
+            //             }
+            //         ]
+            //     },
+            //     html,
+            //     platform
+            // );
             return Array.isArray(result) && result.length > 0 ? JSON.parse(JSON.stringify(result[0], null, 4)) : null;
         }
         catch (error) {
+            logData_js_1.logger.info("attribute");
             logData_js_1.logger.error(`[${Object.getPrototypeOf(this).constructor.name}] : `, "Unable to find the element", error);
             return "";
         }

package/dist/fireflinkData/fireflinkLocators/{elementsFromHTML.d.ts → parser/getElementsFromHTML.d.ts}

@@ -1,4 +1,6 @@
-type ElementDetails = {
+import { ElementRecord } from "../types/locator.js";
+import { platform } from "../../../core/types/scriptTypesType.js";
+type AiElementDetails = {
     id?: string | null;
     className?: string | null;
     xpathByText?: string | null;
@@ -12,13 +14,5 @@ type ElementDetails = {
     relativeXpath?: string | null;
     [key: string]: any;
 };
-interface Locator {
-    name: string;
-    type: string;
-    value: string;
-    reference: string;
-    status: string;
-    isRecorded: string;
-}
-declare const getElementsFromHTML: (locators: Locator[], htmlString: string) => ElementDetails | null;
-export { getElementsFromHTML };
+declare const getAiElementsFromHTML: (record: ElementRecord, htmlString: string, platform: platform) => AiElementDetails | null;
+export { getAiElementsFromHTML };