@dev-blinq/cucumber_client 1.0.1477-dev → 1.0.1479-dev

package/bin/assets/scripts/unique_locators.js

@@ -221,6 +221,8 @@ class LocatorGenerator {
     const commonParent = this.dom_Parent.findLowestCommonAncestor([contextElement, element]);
     const climb = this.dom_Parent.getClimbCountToParent(contextElement, commonParent);
     const text = contextElement.innerText.trim();
+
+    const prefix = `internal:text="${text}" >> ${this.getXPathSelector(climb)}`;
     const result = this.getElementLocators(element, {
       root: commonParent,
       strategies: {
@@ -228,24 +230,13 @@ class LocatorGenerator {
         [this.locatorStrategies.text]: true,
         [this.locatorStrategies.no_text]: true,
       },
+      prefix,
     });
 
-    const randomToken = Math.random().toString(36).substring(2, 8);
-    commonParent.setAttribute("data-blinq--" + randomToken, "true");
-    // const contextLocators = [];
-
     const attachContextToLocators = (locs) => {
       locs.forEach((loc) => {
         loc.climb = climb;
         loc.text = text;
-        const _selector = `[data-blinq--${randomToken}]` + " >> " + this.getXPathSelector(climb) + " >> " + loc.css;
-        const elements = this.getMatchingElements(_selector, { root: window.document });
-        const index = elements.indexOf(element);
-        if (index !== -1) {
-          loc.index = index;
-        } else {
-          console.error("Invalid context locator, element not found in context locator", loc, element, contextElement);
-        }
       });
     };
     const allStrategyLocators = result.allStrategyLocators;
@@ -262,6 +253,7 @@ class LocatorGenerator {
       attachContextToLocators(allLocators);
       allStrategyLocators[this.locatorStrategies.context] = allLocators;
       allStrategyLocators.strategy = this.locatorStrategies.context;
+      result.locators = allLocators;
       return result;
     }
     if (locators) {
@@ -678,7 +670,7 @@ class LocatorGenerator {
 
   getUniqueLocators2(element, locatorGenerator = this.getNoTextLocators, options = {}) {
     try {
-      const { maxLocators = 5, root = window.document.body } = options;
+      const { maxLocators = 5, root = window.document.body, prefix } = options;
 
       if (!element) {
         return [];
@@ -725,12 +717,13 @@ class LocatorGenerator {
 
       const elementsCache = new Map();
 
-      const allAncestors = this.dom_Parent.getFullAncestorChainToRoot(element, root);
+      const allAncestors = prefix ? [element] : this.dom_Parent.getFullAncestorChainToRoot(element, root);
       allAncestors.shift(); // remove the element itself from the ancestors
 
       const cache = new Map();
       const textToIgnore = this.PW.selectorUtils.elementText(cache, element).full.trim();
       const ancestorLocators = [];
+      let uniqueAncestor = null;
       for (const ancestor of allAncestors) {
         const _locators = locatorGenerator(ancestor, { ...options, textToIgnore });
         if (!_locators || !Array.isArray(_locators) || _locators.length === 0) {
@@ -743,11 +736,15 @@ class LocatorGenerator {
         });
         elementsCache.set(ancestor, _categorized);
         if (_categorized.unique.length > 0) {
+          uniqueAncestor = {
+            element: ancestor,
+            locators: _categorized,
+          };
           break;
         }
       }
 
-      const uniqueAncestor = ancestorLocators[ancestorLocators.length - 1];
+      // const uniqueAncestor = ancestorLocators[ancestorLocators.length - 1];
 
       for (const locator of nonUnique) {
         const selector = locator.css ?? locator.selector;
@@ -756,6 +753,27 @@ class LocatorGenerator {
           console.warn(`No elements found for locator: ${selector}`);
           continue;
         }
+        if (!uniqueAncestor) {
+          const elements = this.getMatchingElements(selector, options);
+          if (elements.length === 1 && elements[0] === element) {
+            result.push({
+              css: selector,
+              score: locator.score,
+              priority: 1,
+            });
+          } else {
+            const index = elements.indexOf(element);
+            if (index !== -1) {
+              result.push({
+                css: selector,
+                index,
+                score: locator.score + 200,
+                priority: 2,
+              });
+            }
+          }
+          continue;
+        }
 
         for (const unique_locator of uniqueAncestor.locators.unique) {
           const fullSelector = `${unique_locator.css} >> ${selector}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1477-dev",
+  "version": "1.0.1479-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -39,7 +39,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.187-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.852-dev",
+    "automation_model": "1.0.853-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",