@wdio/nightwatch-devtools 1.5.0 → 1.5.1

package/dist/index.js

@@ -554,10 +554,45 @@ function isSameElement(node1, node2) {
   }
   return false;
 }
+function sanitizePageSource(sourceXML) {
+  let sanitized = sourceXML.replace(
+    /&(?!(?:amp|lt|gt|quot|apos|#\d+|#x[0-9a-fA-F]+);)/g,
+    "&"
+  );
+  const VOID_ELEMENTS = [
+    "link",
+    "meta",
+    "br",
+    "hr",
+    "img",
+    "input",
+    "source",
+    "area",
+    "base",
+    "col",
+    "embed",
+    "track",
+    "wbr"
+  ];
+  for (const tag of VOID_ELEMENTS) {
+    sanitized = sanitized.replace(
+      // eslint-disable-next-line security/detect-non-literal-regexp -- tag from hardcoded list
+      new RegExp(`<${tag}(\\s[^>]*?[^/])>`, "gi"),
+      `<${tag}$1/>`
+    );
+    sanitized = sanitized.replace(
+      // eslint-disable-next-line security/detect-non-literal-regexp -- tag from hardcoded list
+      new RegExp(`<${tag}>`, "gi"),
+      `<${tag}/>`
+    );
+  }
+  return sanitized;
+}
 function xmlToJSON(sourceXML) {
   try {
+    const sanitized = sanitizePageSource(sourceXML);
     const parser = new DOMParser();
-    const sourceDoc = parser.parseFromString(sourceXML, "text/xml");
+    const sourceDoc = parser.parseFromString(sanitized, "text/xml");
     const parseErrors = sourceDoc.getElementsByTagName("parsererror");
     if (parseErrors.length > 0) {
       console.error(
@@ -576,8 +611,9 @@ function xmlToJSON(sourceXML) {
 }
 function xmlToDOM(sourceXML) {
   try {
+    const sanitized = sanitizePageSource(sourceXML);
     const parser = new DOMParser();
-    const doc = parser.parseFromString(sourceXML, "text/xml");
+    const doc = parser.parseFromString(sanitized, "text/xml");
     const parseErrors = doc.getElementsByTagName("parsererror");
     if (parseErrors.length > 0) {
       console.error("[xmlToDOM] XML parsing error:", parseErrors[0].textContent);
@@ -834,7 +870,7 @@ function isValidValue(value) {
   return value !== void 0 && value !== null && value !== "null" && value.trim() !== "";
 }
 function escapeText(text) {
-  return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
+  return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
 }
 function escapeXPathValue(value) {
   if (!value.includes("'")) {
@@ -1395,6 +1431,20 @@ function classifyMobileRole(tagName, platform) {
   }
   return IOS_ROLE_MAP[tagName] || simplifyTag(tagName);
 }
+function getFirstChildText(element) {
+  const queue = [...element.children || []];
+  while (queue.length > 0) {
+    const el = queue.shift();
+    const text = el.attributes?.text?.trim();
+    if (text) {
+      return text;
+    }
+    if (el.children) {
+      queue.push(...el.children);
+    }
+  }
+  return void 0;
+}
 function getBestAndroidLocator(attrs) {
   if (attrs._selector) {
     return attrs._selector;
@@ -1480,7 +1530,7 @@ function isMobileInViewport(element, platform, viewport) {
 function collectMobileNodes(element, platform, depth, nodes, walkOpts) {
   const attrs = element.attributes;
   const role = classifyMobileRole(element.tagName, platform);
-  const name = getMobileNodeIdentity(attrs, platform);
+  let name = getMobileNodeIdentity(attrs, platform);
   const explicit = isExplicitlyInteractive(attrs, platform);
   const interactive = isMobileInteractive(element, platform);
   const inViewport = isMobileInViewport(element, platform, walkOpts.viewport);
@@ -1525,6 +1575,12 @@ function collectMobileNodes(element, platform, depth, nodes, walkOpts) {
     if (!locator) {
       locator = (platform === "android" ? getBestAndroidLocator(attrs) : getBestIOSLocator(attrs)) ?? "";
     }
+    if (!name && platform === "android" && (locator.startsWith("class:") || locator.startsWith('android=new UiSelector().className("'))) {
+      const childText = getFirstChildText(element);
+      if (childText && childText.length < 100) {
+        name = childText;
+      }
+    }
   }
   nodes.push({
     role,