@dev-blinq/cucumber_client 1.0.1222-dev → 1.0.1224-dev

package/bin/assets/preload/recorderv3.js

@@ -459,7 +459,7 @@ class BVTRecorder {
       getAction: (e) => {
         consumeEvent(e);
       },
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -474,7 +474,7 @@ class BVTRecorder {
         };
       },
       getAction: () => null,
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -489,7 +489,7 @@ class BVTRecorder {
         };
       },
       getAction: () => null,
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -928,6 +928,8 @@ class BVTRecorder {
       // }
 
       lastInputId = el.dataset.inputId;
+
+      el.__locators = this.getLocatorsObject(el);
     }
     const role = window.getAriaRole(el);
     const label = window.getElementAccessibleName(el, false) || window.getElementAccessibleName(el, true) || role || "";
@@ -1098,6 +1100,7 @@ class BVTRecorder {
         improviseLocators: false,
         mustIncludeCSSChain: true,
         root: commonParent,
+        noCSSId: true,
       });
       locators.forEach((locator) => {
         locator.text = text;
@@ -1218,7 +1221,8 @@ class BVTRecorder {
             action: action.details,
             element: this.getElementDetails(actionElement, eventName),
             isPopupCloseClick: this.isPopupCloseEvent(e),
-            ...this.getLocatorsObject(actionElement),
+            // ...this.getLocatorsObject(actionElement),
+            ...(actionElement.__locators ?? this.getLocatorsObject(actionElement)),
             frame: this.getFrameDetails(),
             statistics: {
               time: `${performance.measure("command-received", "command-send").duration.toFixed(2)} ms`,

package/bin/assets/preload/unique_locators.js

@@ -29,6 +29,8 @@ const getMatchingElements = (selector, options = {}) => {
   return window.__injectedScript.querySelectorAll(window.__injectedScript.parseSelector(selector), root);
 };
 
+window.getMatchingElements = getMatchingElements;
+
 const getPWSelectors = (element, options = {}) => {
   const selectors = [];
   const exludeText = options?.excludeText || false;
@@ -147,7 +149,25 @@ const getElementLocators = (element, options) => {
     .map((item) => {
       return item;
     });
-
+  if (result.nonUnique.length === 0) {
+    // find slector with min score
+    let minScore = Infinity;
+    let minSelector = null;
+    for (const locator of pw_locators) {
+      if (locator.score < minScore) {
+        minScore = locator.score;
+        minSelector = locator.selector;
+      }
+    }
+    if (minSelector) {
+      result.nonUnique.push({
+        css: minSelector,
+        priority: 2,
+        elements: getMatchingElements(minSelector, options),
+        score: minScore,
+      });
+    }
+  }
   return result;
 };
 
@@ -337,6 +357,7 @@ function generateUniqueCSSSelector(element, options) {
   const root = options?.root || window.document;
   const separator = options?.separator || " > ";
   const isUnique = options?.isunique || ((selector) => getMatchingElements(selector, options).length === 1);
+  const noCSSId = options?.noCSSId || false;
 
   if (!(element instanceof Element)) return null;
 
@@ -344,7 +365,7 @@ function generateUniqueCSSSelector(element, options) {
 
   let selector = "";
   const id = element.getAttribute("id");
-  if (id && !/\d/.test(id)) {
+  if (id && !/\d/.test(id) && (!noCSSId)) {
     selector = "#" + cssEscape(id);
     if (isUnique(selector)) return selector;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1222-dev",
+  "version": "1.0.1224-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",