automation_model 1.0.3 → 1.0.5

package/bin/stable_browser.js

@@ -9,44 +9,50 @@ class StableBrowser {
       timeout: 60000,
     });
   }
-  async _locate(selector) {
-    if (selector.startsWith("{")) {
+  async _locate(selector, scope) {
+    if (typeof selector === "object") {
       try {
-        const locatorObject = JSON.parse(selector);
-        let type = locatorObject.type;
-        if (!type) {
-          type = "css";
+        if (Array.isArray(selector)) {
+          let currentScope = scope;
+
+          for (let i = 0; i < selector.length; i++) {
+            currentScope = await this._locate(
+              selector[i],
+              currentScope
+            ).first();
+          }
+        }
+        if (selector.css) {
+          return await scope.locator(selector.css).first();
+        }
+        if (selector.role) {
+          return await scope
+            .getByRole(selector.role[0], selector.role[1])
+            .first();
         }
-        switch (type) {
-          case "css":
-            return await this.page.locator(locatorObject.locator);
-          case "role":
-            return await this.page.getByRole(
-              locatorObject.role,
-              locatorObject.options
-            );
-          case "text":
-            return await this.page.getByText(locatorObject.text);
-          default:
-            throw new Error(`Unknown locator type ${type}`);
+        if (selector.text) {
+          return await scope.getByText(selector.text).first();
         }
+        throw new Error(`Unknown locator type ${type}`);
       } catch (e) {
         console.log("invalid locator object, will try to parse as text");
       }
     }
 
     if (selector.startsWith("TEXT=")) {
-      return await this.page.getByText(selector.substring("TEXT=".length));
+      return await this.page
+        .getByText(selector.substring("TEXT=".length))
+        .first();
     } else {
-      return await this.page.locator(selector);
+      return await this.page.locator(selector).first();
     }
   }
 
   async click(selector) {
-    (await this._locate(selector)).click();
+    (await this._locate(selector, this.page)).click();
   }
   async fill(selector, value) {
-    let element = await this._locate(selector);
+    let element = await this._locate(selector, this.page);
     await element.fill(value);
     await element.dispatchEvent("change");
   }

package/package.json

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