automation_model 1.0.42 → 1.0.44

package/bin/stable_browser.js

@@ -195,51 +195,76 @@ class StableBrowser {
     }
     let element = await this._locate(selector, info, _params);
     await this._screenShot(options);
-    let textFound = await element.evaluate((_node) => {
-      function isInline(element) {
-        var displayStyle = window.getComputedStyle(element, null).getPropertyValue("display");
-        return displayStyle === "inline" || displayStyle === "inline-block";
-      }
+    return await element.innerText();
+    // let textFound = await element.evaluate((_node) => {
+    //   function isInline(element) {
+    //     var displayStyle = window.getComputedStyle(element, null).getPropertyValue("display");
+    //     return displayStyle === "inline" || displayStyle === "inline-block";
+    //   }
 
-      function isElementVisible(element) {
-        if (!element.getBoundingClientRect) {
-          return true;
-        }
-        const rect = element.getBoundingClientRect();
-        if (rect.height === 0 || rect.width === 0) {
-          return false;
-        }
-        const viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight);
-        return !(rect.bottom < 0 || rect.top - viewHeight >= 0);
-      }
-      function getVisibleText(node) {
-        if (!isElementVisible(node)) {
-          return "";
-        }
-        if (node.nodeType === Node.TEXT_NODE) {
-          return node.nodeValue.trim();
-        }
-        if (node.nodeType !== Node.ELEMENT_NODE) {
-          return "";
-        }
-        let block = !isInline(node);
-        let text = "";
-        for (let child of node.childNodes) {
-          text += getVisibleText(child);
-        }
-        if (block) {
-          text += "\n";
-        } else {
-          text = " " + text;
-        }
-        return text;
+    //   function isElementVisible(element) {
+    //     if (!element.getBoundingClientRect) {
+    //       return true;
+    //     }
+    //     const rect = element.getBoundingClientRect();
+    //     if (rect.height === 0 || rect.width === 0) {
+    //       return false;
+    //     }
+    //     const viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight);
+    //     return !(rect.bottom < 0 || rect.top - viewHeight >= 0);
+    //   }
+    //   function getVisibleText(node) {
+    //     if (!isElementVisible(node)) {
+    //       return "";
+    //     }
+    //     if (node.nodeType === Node.TEXT_NODE) {
+    //       return node.nodeValue.trim();
+    //     }
+    //     if (node.nodeType !== Node.ELEMENT_NODE) {
+    //       return "";
+    //     }
+    //     let block = !isInline(node);
+    //     let text = "";
+    //     for (let child of node.childNodes) {
+    //       text += getVisibleText(child);
+    //     }
+    //     if (block) {
+    //       text += "\n";
+    //     } else {
+    //       text = " " + text;
+    //     }
+    //     return text;
+    //   }
+    //   return getVisibleText(_node).trim();
+    // });
+    // return textFound
+    //   .split("\n")
+    //   .filter((line) => line.trim() !== "")
+    //   .join("\n");
+  }
+  async containsPattern(selector, pattern, text, _params = null, options = {}) {
+    const info = {};
+    info.log = [];
+    info.operation = "containsPattern";
+    info.selector = selector;
+    info.value = text;
+    info.pattern = pattern;
+    try {
+      let foundText = await this.getText(selector, _params, options, info);
+      let escapedText = text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+      let pattern = pattern.replace("{text}", escapedText);
+      let regex = new RegExp(pattern);
+      if (!regex.test(foundText)) {
+        info.foundText = foundText;
+        throw new Error("element doesn't contain text " + text);
       }
-      return getVisibleText(_node).trim();
-    });
-    return textFound
-      .split("\n")
-      .filter((line) => line.trim() !== "")
-      .join("\n");
+      return info;
+    } catch (e) {
+      this.logger.error("verify element contains text failed " + JSON.stringify(info));
+      Object.assign(e, { info: info });
+      await this._screenShot(options);
+      throw e;
+    }
   }
 
   async containsText(selector, text, _params = null, options = {}) {
@@ -302,4 +327,5 @@ class StableBrowser {
     await this._screenShot(options);
   }
 }
+
 export { StableBrowser };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automation_model",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "An automation infrastructure module to be use for generative AI automation projects.",
   "main": "bin/index.js",
   "type": "module",