ff-automationv2 2.2.24 → 2.2.25

package/dist/utils/swipe/domSearchHelper.js

@@ -2,29 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findElementInDom = findElementInDom;
 const jsForAttributeInjection_js_1 = require("../DomExtraction/jsForAttributeInjection.js");
-const simplifyAndFlatten_js_1 = require("../../domAnalysis/simplifyAndFlatten.js");
 const xpathcreation_js_1 = require("../helpers/xpathcreation.js");
-async function findElementInDom(driver, text) {
-    const simplifier = new simplifyAndFlatten_js_1.DomSimplifier();
-    const keywords = text
-        .toLowerCase()
-        .split(/\s+/)
-        .filter(Boolean);
-    const { dom: annotatedDom } = await (0, jsForAttributeInjection_js_1.getAnnotatedDOMForMobile)(driver);
-    const { flatNodes } = simplifier.simplifyMobile(annotatedDom);
-    const sequenceMatch = (value, words) => {
-        const v = value.toLowerCase();
-        const pattern = new RegExp("\\b" + words.join("\\s*") + "\\b", "i");
-        return pattern.test(v);
-    };
-    for (const nodeObj of flatNodes) {
-        const node = nodeObj.node;
+const getRelaventElements_js_1 = require("../../domAnalysis/getRelaventElements.js");
+const logData_js_1 = require("../logger/logData.js");
+async function findElementInDom(driver, text, stepCount, rawdom) {
+    const engine = new getRelaventElements_js_1.DomProcessingEngine();
+    const { dom: annotatedDom } = await (0, jsForAttributeInjection_js_1.getAnnotatedDOMForMobile)(driver, rawdom);
+    logData_js_1.logger.saveDOM(annotatedDom, `annotated-dom-${100 + stepCount}`);
+    const results = engine.mobileProcess({
+        keywords: text,
+        rawDom: annotatedDom,
+        stepCount: 100 + stepCount
+    });
+    logData_js_1.logger.saveJSON(results, `relevant-dom-Mob-${100 + stepCount}`);
+    const keywords = text.toLowerCase().split(/\s+/);
+    function exactSequenceMatch(value, words) {
+        const v = (value || "").toLowerCase();
+        const escaped = words.map(w => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+        const pattern = escaped.join("\\s*");
+        return new RegExp(pattern).test(v);
+    }
+    function matchNode(node, words) {
         const textVal = (node["text"] || "").toLowerCase();
-        const descVal = (node["content-desc"] || "").toLowerCase();
-        const ridVal = (node["resource-id"] || "").toLowerCase();
-        if (sequenceMatch(textVal, keywords) ||
-            sequenceMatch(descVal, keywords) ||
-            sequenceMatch(ridVal, keywords)) {
+        // const desc = (node.name || "").toLowerCase();
+        // const value = (node.value || "").toLowerCase();
+        const contentDesc = (node["content-desc"] ||
+            node.contentDesc ||
+            node.contentDescription ||
+            "").toLowerCase();
+        const resourceId = (node["resource-id"] ||
+            node.resourceId ||
+            node.id ||
+            "").toLowerCase();
+        logData_js_1.logger.info(`contentdesc is ${contentDesc}, Resource id is ${resourceId} the text is ${words}`);
+        if (exactSequenceMatch(textVal, words))
+            return true;
+        // if (exactSequenceMatch(desc, words)) return true;
+        // if (exactSequenceMatch(value, words)) return true;
+        if (exactSequenceMatch(contentDesc, words))
+            return true;
+        if (exactSequenceMatch(resourceId, words))
+            return true;
+        return false;
+    }
+    for (const group of results) {
+        for (const node of group) {
+            if (!matchNode(node, keywords))
+                continue;
             const ffIndex = node["FF-inspecter"];
             if (!ffIndex)
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-automationv2",
-  "version": "2.2.24",
+  "version": "2.2.25",
   "private": false,
   "type": "commonjs",
   "description": "This lib is used to automate the manual testcase",
@@ -16,6 +16,9 @@
   "files": [
     "dist"
   ],
+  "overrides": {
+    "canvas": "@napi-rs/canvas"
+  },
   "scripts": {
     "type-check": "tsc --noEmit",
     "builds": "npm run lint && tsc",
@@ -53,10 +56,8 @@
     "typescript-eslint": "8.56.0",
     "webdriverio": "9.26.1"
   },
-  "peerDependencies": {
-    "canvas": "^3.2.3"
-  },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.100",
     "@xmldom/xmldom": "^0.8.11",
     "axios": "^1.13.5",
     "cheerio": "1.2.0",