@dev-blinq/cucumber_client 1.0.1310-dev → 1.0.1312-dev

package/bin/assets/scripts/unique_locators.js

@@ -213,102 +213,107 @@ class LocatorGenerator {
 			return [];
 		}
 		const result = [];
-		const textSet = new Set();
-		for (const locator of locators) {
-			const selector = locator.css;
-			if (!selector || typeof selector !== "string") {
-				console.error("Locator must have a valid css selector");
-				continue;
-			}
-			const parseResult = this.injectedScript.parseSelector(selector);
-			const parts = parseResult.parts;
-			if (!parts || !Array.isArray(parts) || parts.length === 0) {
-				console.error("Locator must have a valid css selector");
-				continue;
-			}
-			// ignore parts.length < 3
-			if (parts.length < 3) {
-				// console.warn("Locator must have at least 3 parts to be a context locator");
-				continue;
-			}
-			const firstPart = parts[0];
-			if (firstPart.name !== "internal:text") {
-				// console.warn("Locator must have internal:text as the first part to be a context locator");
-				continue;
-			}
-			const textBody = firstPart.body;
-			if (!textBody || typeof textBody !== "string" || textBody.length === 0) {
-				console.error("Locator must have a valid text in the first part to be a context locator");
-				continue;
-			}
-			const secondPart = parts[1];
-			if (secondPart.name !== "xpath") {
-				continue;
-			}
-			const xpath = secondPart.body;
-			if (!xpath || typeof xpath !== "string" || xpath.length === 0) {
-				// console.error("Locator must have a valid xpath in the second part to be a context locator");
-				continue;
-			}
-			const climbString = secondPart.body;
-			if (!climbString || typeof climbString !== "string" || climbString.length === 0) {
-				continue;
-			}
-			const climbStringRegex = /(\.\.)(\/\.\.)*/;
-			try {
-				const match = climbStringRegex.test(climbString);
-				if (match) {
-					const climbCount = climbString.split("..").length - 1;
-					const lastIndex = selector.indexOf(climbString);
-					const restOfSelector = selector.substring(lastIndex + climbString.length + 3).trim();
-					if (restOfSelector.length === 0) {
-						// console.warn("Locator must have a valid rest of selector after the xpath part to
-						// be a context locator");
-						continue;
-					}
+		try {
 
-					const textLocator = `internal:text=${textBody}`;
-					const elements = this.getMatchingElements(textLocator, {});
-					if (elements.length !== 1) {
-						// throw new Error("Context locator must have exactly one element matching the text part");
-						console.error("Context locator must have exactly one element matching the text part");
-						continue;
-					}
-					const textElement = elements[0];
-					// const text = this.PW.selectorUtils.elementText(textElement);
-					const text = this.injectedScript.utils.elementText(new Map(), textElement).full;
-
-					const fullSelector = `${textLocator} >> xpath=${xpath} >> ${restOfSelector}`;
-					const fullElements = this.getMatchingElements(fullSelector, {});
-					if (fullElements.length !== 1) {
-						// throw new Error("Context locator must have exactly one element matching the full selector");
-						console.error("Context locator must have exactly one element matching the full selector");
-						continue;
-					}
-					const fullElement = fullElements[0];
-					if (fullElement !== element) {
-						// throw new Error("Context locator must have the text element as the full element");
-						console.error("Context locator must have the text element as the full element");
-						continue;
-					}
-					if (!textSet.has(text)) {
-						textSet.add(text);
-						const loc = {
-							css: restOfSelector,
-							climb: climbCount,
-							text,
-							priority: 1,
-						};
-						if (locator.index !== undefined) {
-							loc.index = locator.index;
+			const textSet = new Set();
+			for (const locator of locators) {
+				const selector = locator.css;
+				if (!selector || typeof selector !== "string") {
+					console.error("Locator must have a valid css selector");
+					continue;
+				}
+				const parseResult = this.injectedScript.parseSelector(selector);
+				const parts = parseResult.parts;
+				if (!parts || !Array.isArray(parts) || parts.length === 0) {
+					console.error("Locator must have a valid css selector");
+					continue;
+				}
+				// ignore parts.length < 3
+				if (parts.length < 3) {
+					// console.warn("Locator must have at least 3 parts to be a context locator");
+					continue;
+				}
+				const firstPart = parts[0];
+				if (firstPart.name !== "internal:text") {
+					// console.warn("Locator must have internal:text as the first part to be a context locator");
+					continue;
+				}
+				const textBody = firstPart.body;
+				if (!textBody || typeof textBody !== "string" || textBody.length === 0) {
+					console.error("Locator must have a valid text in the first part to be a context locator");
+					continue;
+				}
+				const secondPart = parts[1];
+				if (secondPart.name !== "xpath") {
+					continue;
+				}
+				const xpath = secondPart.body;
+				if (!xpath || typeof xpath !== "string" || xpath.length === 0) {
+					// console.error("Locator must have a valid xpath in the second part to be a context locator");
+					continue;
+				}
+				const climbString = secondPart.body;
+				if (!climbString || typeof climbString !== "string" || climbString.length === 0) {
+					continue;
+				}
+				const climbStringRegex = /(\.\.)(\/\.\.)*/;
+				try {
+					const match = climbStringRegex.test(climbString);
+					if (match) {
+						const climbCount = climbString.split("..").length - 1;
+						const lastIndex = selector.indexOf(climbString);
+						const restOfSelector = selector.substring(lastIndex + climbString.length + 3).trim();
+						if (restOfSelector.length === 0) {
+							// console.warn("Locator must have a valid rest of selector after the xpath part to
+							// be a context locator");
+							continue;
+						}
+
+						const textLocator = `internal:text=${textBody}`;
+						const elements = this.getMatchingElements(textLocator, {});
+						if (elements.length !== 1) {
+							// throw new Error("Context locator must have exactly one element matching the text part");
+							console.error("Context locator must have exactly one element matching the text part");
+							continue;
+						}
+						const textElement = elements[0];
+						// const text = this.PW.selectorUtils.elementText(textElement);
+						const text = this.injectedScript.utils.elementText(new Map(), textElement).full;
+
+						const fullSelector = `${textLocator} >> xpath=${xpath} >> ${restOfSelector}`;
+						const fullElements = this.getMatchingElements(fullSelector, {});
+						if (fullElements.length !== 1) {
+							// throw new Error("Context locator must have exactly one element matching the full selector");
+							console.error("Context locator must have exactly one element matching the full selector");
+							continue;
+						}
+						const fullElement = fullElements[0];
+						if (fullElement !== element) {
+							// throw new Error("Context locator must have the text element as the full element");
+							console.error("Context locator must have the text element as the full element");
+							continue;
+						}
+						if (!textSet.has(text)) {
+							textSet.add(text);
+							const loc = {
+								css: restOfSelector,
+								climb: climbCount,
+								text,
+								priority: 1,
+							};
+							if (locator.index !== undefined) {
+								loc.index = locator.index;
+							}
+							result.push(loc);
 						}
-						result.push(loc);
 					}
+				} catch (error) {
+					console.error("Error parsing climb string:", error);
+					continue;
 				}
-			} catch (error) {
-				console.error("Error parsing climb string:", error);
-				continue;
 			}
+		} catch (error) {
+			console.error("Error generating context locators:", error);
 		}
 		// Sort by text length to prioritize shorter texts
 		result.sort((a, b) => a.text.length - b.text.length);
@@ -316,65 +321,70 @@ class LocatorGenerator {
 	}
 	getDigitIgnoreLocators(element, locators) {
 		const result = [];
-		if (!locators || !Array.isArray(locators)) {
-			console.error("Locators must be an array");
-			return [];
-		}
-
-		for (const locator of locators) {
-			const selector = locator.css;
-			if (!selector || typeof selector !== "string") {
-				console.error("Locator must have a valid css selector");
-				continue;
-			}
-			const parseresult = this.injectedScript.parseSelector(selector);
-			const parts = parseresult.parts;
-			if (!parts || !Array.isArray(parts) || parts.length === 0) {
-				console.error("Locator must have a valid css selector");
-				continue;
+		try {
+			if (!locators || !Array.isArray(locators)) {
+				console.error("Locators must be an array");
+				return [];
 			}
-			let finalSelector = "";
-			let hasDigitsInText = false;
-			for (const part of parts) {
-				if (part.name !== "internal:text") {
-					finalSelector += `${part.name === "css" ? "" : part.name + "="}${part.source} >> `;
+
+			for (const locator of locators) {
+				const selector = locator.css;
+				if (!selector || typeof selector !== "string") {
+					console.error("Locator must have a valid css selector");
 					continue;
 				}
-				if (typeof part.body !== "string" || part.body.length === 0) {
-					// console.error("Locator must have a valid text in the first part to be a digit ignore locator");
-					finalSelector += `${part.name === "css" ? "" : part.name + "="}${part.source} >> `;
+				const parseresult = this.injectedScript.parseSelector(selector);
+				const parts = parseresult.parts;
+				if (!parts || !Array.isArray(parts) || parts.length === 0) {
+					console.error("Locator must have a valid css selector");
 					continue;
 				}
-				const text = part.body;
-				const digitsRegex = /\d+/g;
-				hasDigitsInText = digitsRegex.test(text);
+				let finalSelector = "";
+				let hasDigitsInText = false;
+				for (const part of parts) {
+					if (part.name !== "internal:text") {
+						finalSelector += `${part.name === "css" ? "" : part.name + "="}${part.source} >> `;
+						continue;
+					}
+					if (typeof part.body !== "string" || part.body.length === 0) {
+						// console.error("Locator must have a valid text in the first part to be a digit ignore locator");
+						finalSelector += `${part.name === "css" ? "" : part.name + "="}${part.source} >> `;
+						continue;
+					}
+					const text = part.body;
+					const digitsRegex = /\d+/g;
+					hasDigitsInText = digitsRegex.test(text);
 
-				let pattern = this.PW.stringUtils.escapeRegExp(text.substring(1, text.length - 2));
-				pattern = pattern.replace(digitsRegex, "\\d+");
-				finalSelector += `internal:text=/${pattern}/ >> `;
-			}
-			if (!hasDigitsInText) {
-				continue;
-			}
-			if (finalSelector.endsWith(` >> `)) {
-				finalSelector = finalSelector.slice(0, -4);
-			}
-			if (finalSelector) {
-				const elements = this.getMatchingElements(finalSelector, {});
-				if (elements.length !== 1) {
-					console.error("Digit ignore locator must have exactly one element matching the final selector");
-					continue;
+					let pattern = this.PW.stringUtils.escapeRegExp(text.substring(1, text.length - 2));
+					pattern = pattern.replace(digitsRegex, "\\d+");
+					finalSelector += `internal:text=/${pattern}/ >> `;
 				}
-				if (elements[0] !== element) {
-					console.error("Digit ignore locator must match the original element");
+				if (!hasDigitsInText) {
 					continue;
 				}
-				result.push({
-					css: finalSelector,
-					priority: locator.priority || 1,
-				});
+				if (finalSelector.endsWith(` >> `)) {
+					finalSelector = finalSelector.slice(0, -4);
+				}
+				if (finalSelector) {
+					const elements = this.getMatchingElements(finalSelector, {});
+					if (elements.length !== 1) {
+						console.error("Digit ignore locator must have exactly one element matching the final selector");
+						continue;
+					}
+					if (elements[0] !== element) {
+						console.error("Digit ignore locator must match the original element");
+						continue;
+					}
+					result.push({
+						css: finalSelector,
+						priority: locator.priority || 1,
+					});
+				}
 			}
+		} catch (error) {
+			console.error("Error generating digit ignore locators:", error);
 		}
+
 		return result;
 	}
 	getTextwithIndexLocators(locators) {
@@ -383,17 +393,22 @@ class LocatorGenerator {
 			return [];
 		}
 		const result = [];
-		for (const locator of locators) {
-			if (!locator || !locator.css || typeof locator.css !== "string") {
-				console.error("Locator must have a valid css selector");
-				continue;
-			}
-			const index = locator.index;
-			if (typeof index !== "number" || index < 0) {
-				console.error("Locator must have a valid index");
-				continue;
+		try {
+			for (const locator of locators) {
+				if (!locator || !locator.css || typeof locator.css !== "string") {
+					console.error("Locator must have a valid css selector");
+					continue;
+				}
+				const index = locator.index;
+				if (typeof index !== "number" || index < 0) {
+					// console.error("Locator must have a valid index");
+					continue;
+				}
+				result.push(locator);
 			}
-			result.push(locator);
+
+		} catch (error) {
+			console.error("Error getting text with index locators:", error);
 		}
 		return result;
 	}
@@ -417,28 +432,33 @@ class LocatorGenerator {
 	categorizeLocators(element, locators, options) {
 		const unique = [];
 		const nonUnique = [];
-		for (const locator of locators) {
-			const elements = this.getMatchingElements(locator.css, options);
-			if (elements.length === 0) {
-				console.warn(`No elements found for locator: ${locator.css}`);
-				continue;
-			} else if (elements.length === 1) {
-				if (element === elements[0]) {
-					locator.priority = 1;
-					unique.push(locator);
-				} else if (element.contains(elements[0])) {
-					locator.priority = 1;
-					const climb = this.dom_Parent.getClimbCountToParent(elements[0], element);
-					const climbSelector = this.getXPathSelector(climb);
-					const newSelector = `${locator.css} >> ${climbSelector}`;
-					locator.css = newSelector;
-					unique.push(locator);
+		try {
+
+			for (const locator of locators) {
+				const elements = this.getMatchingElements(locator.css, options);
+				if (elements.length === 0) {
+					console.warn(`No elements found for locator: ${locator.css}`);
+					continue;
+				} else if (elements.length === 1) {
+					if (element === elements[0]) {
+						locator.priority = 1;
+						unique.push(locator);
+					} else if (element.contains(elements[0])) {
+						locator.priority = 1;
+						const climb = this.dom_Parent.getClimbCountToParent(elements[0], element);
+						const climbSelector = this.getXPathSelector(climb);
+						const newSelector = `${locator.css} >> ${climbSelector}`;
+						locator.css = newSelector;
+						unique.push(locator);
+					}
+				} else {
+					locator.priority = 2;
+					locator.elements = elements;
+					nonUnique.push(locator);
 				}
-			} else {
-				locator.priority = 2;
-				locator.elements = elements;
-				nonUnique.push(locator);
 			}
+		} catch (error) {
+			console.error("Error categorizing locators:", error);
 		}
 		return { unique, nonUnique };
 	}

package/bin/assets/templates/utils_template.txt

@@ -19,9 +19,7 @@ const elements = {};
 
 let context = null;
 Before(async function (scenario) {
-  if (!context) {
-    context = await initContext(url, false, false, this);
-  }
+  context = await initContext(url, false, false, this);
   await navigate(url);
   await context.web.beforeScenario(this, scenario);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1310-dev",
+  "version": "1.0.1312-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -32,7 +32,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.177-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.772-dev",
+    "automation_model": "1.0.773-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",