ff-dom 1.0.2 → 1.0.4

package/dist/utils/getElementsFromHTML.js

@@ -7,7 +7,7 @@ const isUnique = (xpathResult) => {
 };
 const getElementFromShadowRoot = (element, selector) => {
     const shadowRoot = element.shadowRoot;
-    if (shadowRoot) {
+    if (shadowRoot && !selector.includes("dynamic")) {
         return shadowRoot.querySelector(selector);
     }
     return null;
@@ -66,6 +66,16 @@ const getXpathByName = (element) => {
     }
     return null;
 };
+const getName = (element) => {
+    const elementEl = element;
+    if (elementEl.hasAttribute("name")) {
+        const attrValue = elementEl.getAttribute("name");
+        const name = `${attrValue}`;
+        console.log("get name", name);
+        return name || null;
+    }
+    return null;
+};
 const getXpathByPlaceholder = (element) => {
     const selector = element.nodeName.toLowerCase();
     const elementEl = element;
@@ -135,26 +145,28 @@ function checkReferenceElementIsValid(locator, relation, tempDiv) {
         const window = currentElement.ownerDocument.defaultView;
         if (!window)
             return null;
-        const xpathEvaluator = new window.XPathEvaluator();
-        const xpathResult = xpathEvaluator.evaluate(sourceLoc, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
-        const sourceElement = xpathResult.singleNodeValue;
-        if (sourceElement) {
-            const xpathResultComplete = xpathEvaluator.evaluate(locator, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
-            const completeElement = xpathResultComplete.singleNodeValue;
-            let relativeXpath;
-            if (completeElement) {
-                relativeXpath = locator;
-                return relativeXpath;
+        if (!locator.includes("dynamic")) {
+            const xpathEvaluator = new window.XPathEvaluator();
+            const xpathResult = xpathEvaluator.evaluate(sourceLoc, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+            const sourceElement = xpathResult.singleNodeValue;
+            if (sourceElement) {
+                const xpathResultComplete = xpathEvaluator.evaluate(locator, currentElement.ownerDocument, null, window.XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+                const completeElement = xpathResultComplete.singleNodeValue;
+                let relativeXpath;
+                if (completeElement) {
+                    relativeXpath = locator;
+                    return relativeXpath;
+                }
+                else {
+                    console.error("Complete Locator is Invalid:", locator);
+                    relativeXpath = locator;
+                    return relativeXpath;
+                }
             }
             else {
-                console.error("Complete Locator is Invalid:", locator);
-                relativeXpath = locator;
-                return relativeXpath;
+                console.error("Source Locator Not Found:", sourceLoc);
             }
         }
-        else {
-            console.error("Source Locator Not Found:", sourceLoc);
-        }
     }
     return null;
 }
@@ -165,9 +177,40 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
     const tempDiv = document.createElement("div");
     tempDiv.innerHTML = htmlString;
     let finalLocators = [];
-    for (const locator of locators) {
+    locators: for (const locator of locators) {
         try {
             let relativeXpath = null;
+            if (locator.value.includes("dynamic") ||
+                locator.type.match("dynamic") ||
+                locator.value.includes("{") ||
+                locator.value.includes("}")) {
+                console.log("Dynamic locator detected:", locator.value);
+                finalLocators.push({
+                    name: locator.name,
+                    type: locator.type,
+                    value: locator.value,
+                    reference: locator.reference,
+                    status: locator.status,
+                    isRecorded: locator.isRecorded,
+                });
+                continue;
+            }
+            if (locator.isRecorded.includes("N") || locator.isRecorded.match("N")) {
+                console.log("Manually added locator detected:", locator.value);
+                finalLocators.push({
+                    name: locator.name,
+                    type: locator.type,
+                    value: locator.value,
+                    reference: locator.reference,
+                    status: locator.status,
+                    isRecorded: locator.isRecorded,
+                });
+                continue;
+            }
+            if (isShared.includes("Y")) {
+                console.log("Shared element detected");
+                break locators;
+            }
             for (const relation of relations) {
                 try {
                     let targetElement = null;
@@ -194,8 +237,9 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                                     trimmedSelector.startsWith(".")) {
                                     targetElement = currentElement.querySelector("." + trimmedSelector);
                                 }
-                                else if (locator.name.includes("xpath") ||
-                                    trimmedSelector.startsWith("//")) {
+                                else if ((locator.name.includes("xpath") ||
+                                    trimmedSelector.startsWith("//")) &&
+                                    !locator.type.match("dynamic")) {
                                     targetElement = getElementFromXPath(tempDiv, trimmedSelector);
                                 }
                                 else {
@@ -204,7 +248,9 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                                         targetElement = getElementFromShadowRoot(currentElement, trimmedSelector);
                                     }
                                 }
-                                if (!targetElement && isSVGElement(currentElement)) {
+                                if (!targetElement &&
+                                    isSVGElement(currentElement) &&
+                                    !locator.type.match("dynamic")) {
                                     targetElement = currentElement.querySelector(trimmedSelector);
                                 }
                                 currentElement = targetElement;
@@ -212,7 +258,10 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                         }
                     }
                     const locatorExists = (name, value) => {
-                        return finalLocators.some((loc) => loc.name === name && loc.value === value);
+                        return finalLocators.some((loc) => loc.name === name &&
+                            loc.value === value &&
+                            (!loc.value.includes("dynamic") ||
+                                !locator.type.match("dynamic")));
                     };
                     const xpathFunctions = [
                         { name: "xpath", value: getXPathByText },
@@ -222,7 +271,6 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                         { name: "xpath", value: getXpathByName },
                         { name: "xpath", value: getXpathByPlaceholder },
                         { name: "xpath", value: getXpathByType },
-                        { name: "xpath", value: getVisibleText },
                     ];
                     if (targetElement) {
                         const idValue = getId(targetElement);
@@ -236,6 +284,29 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                                 isRecorded: locator.isRecorded,
                             });
                         }
+                        if (getVisibleText(targetElement)) {
+                            const textValue = getVisibleText(targetElement);
+                            finalLocators.push({
+                                name: "linkText",
+                                type: "static",
+                                value: textValue,
+                                reference: locator.reference,
+                                status: locator.status,
+                                isRecorded: locator.isRecorded,
+                            });
+                        }
+                        if (getName(targetElement)) {
+                            console.log("inside name if");
+                            const nameLocator = getName(targetElement);
+                            finalLocators.push({
+                                name: "name",
+                                type: "static",
+                                value: nameLocator,
+                                reference: locator.reference,
+                                status: locator.status,
+                                isRecorded: locator.isRecorded,
+                            });
+                        }
                         const classValue = getClassName(targetElement);
                         if (classValue &&
                             classValue.trim() !== "" &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-dom",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/utils/getElementsFromHTML.ts

@@ -24,7 +24,7 @@ const getElementFromShadowRoot = (
   selector: string
 ): Element | null => {
   const shadowRoot = (element as HTMLElement).shadowRoot;
-  if (shadowRoot) {
+  if (shadowRoot && !selector.includes("dynamic")) {
     return shadowRoot.querySelector(selector);
   }
   return null;
@@ -103,6 +103,19 @@ const getXpathByName = (element: Element): string | null => {
   return null;
 };
 
+const getName = (element: Element): string | null => {
+  const elementEl = element as HTMLElement;
+
+  if (elementEl.hasAttribute("name")) {
+    const attrValue = elementEl.getAttribute("name");
+    const name = `${attrValue}`;
+    console.log("get name", name);
+    return name || null;
+  }
+
+  return null;
+};
+
 const getXpathByPlaceholder = (element: Element): string | null => {
   const selector = element.nodeName.toLowerCase();
   const elementEl = element as HTMLElement;
@@ -195,37 +208,38 @@ function checkReferenceElementIsValid(
     let currentElement: Element | null = tempDiv;
     const window = currentElement.ownerDocument.defaultView;
     if (!window) return null;
-
-    const xpathEvaluator = new window.XPathEvaluator();
-    const xpathResult = xpathEvaluator.evaluate(
-      sourceLoc,
-      currentElement.ownerDocument,
-      null,
-      window.XPathResult.FIRST_ORDERED_NODE_TYPE,
-      null
-    );
-
-    const sourceElement = xpathResult.singleNodeValue;
-    if (sourceElement) {
-      const xpathResultComplete = xpathEvaluator.evaluate(
-        locator,
+    if (!locator.includes("dynamic")) {
+      const xpathEvaluator = new window.XPathEvaluator();
+      const xpathResult = xpathEvaluator.evaluate(
+        sourceLoc,
         currentElement.ownerDocument,
         null,
         window.XPathResult.FIRST_ORDERED_NODE_TYPE,
         null
       );
-      const completeElement = xpathResultComplete.singleNodeValue;
-      let relativeXpath: string;
-      if (completeElement) {
-        relativeXpath = locator;
-        return relativeXpath;
+
+      const sourceElement = xpathResult.singleNodeValue;
+      if (sourceElement) {
+        const xpathResultComplete = xpathEvaluator.evaluate(
+          locator,
+          currentElement.ownerDocument,
+          null,
+          window.XPathResult.FIRST_ORDERED_NODE_TYPE,
+          null
+        );
+        const completeElement = xpathResultComplete.singleNodeValue;
+        let relativeXpath: string;
+        if (completeElement) {
+          relativeXpath = locator;
+          return relativeXpath;
+        } else {
+          console.error("Complete Locator is Invalid:", locator);
+          relativeXpath = locator;
+          return relativeXpath;
+        }
       } else {
-        console.error("Complete Locator is Invalid:", locator);
-        relativeXpath = locator;
-        return relativeXpath;
+        console.error("Source Locator Not Found:", sourceLoc);
       }
-    } else {
-      console.error("Source Locator Not Found:", sourceLoc);
     }
   }
   return null;
@@ -262,9 +276,42 @@ const getElementsFromHTML = (
   tempDiv.innerHTML = htmlString;
   let finalLocators = [];
 
-  for (const locator of locators) {
+  locators: for (const locator of locators) {
     try {
       let relativeXpath: string | null = null;
+      if (
+        locator.value.includes("dynamic") ||
+        locator.type.match("dynamic") ||
+        locator.value.includes("{") ||
+        locator.value.includes("}")
+      ) {
+        console.log("Dynamic locator detected:", locator.value);
+        finalLocators.push({
+          name: locator.name,
+          type: locator.type,
+          value: locator.value,
+          reference: locator.reference,
+          status: locator.status,
+          isRecorded: locator.isRecorded,
+        });
+        continue;
+      }
+      if (locator.isRecorded.includes("N") || locator.isRecorded.match("N")) {
+        console.log("Manually added locator detected:", locator.value);
+        finalLocators.push({
+          name: locator.name,
+          type: locator.type,
+          value: locator.value,
+          reference: locator.reference,
+          status: locator.status,
+          isRecorded: locator.isRecorded,
+        });
+        continue;
+      }
+      if (isShared.includes("Y")) {
+        console.log("Shared element detected");
+        break locators;
+      }
       for (const relation of relations) {
         try {
           let targetElement: Element | null = null;
@@ -303,8 +350,9 @@ const getElementsFromHTML = (
                     "." + trimmedSelector
                   );
                 } else if (
-                  locator.name.includes("xpath") ||
-                  trimmedSelector.startsWith("//")
+                  (locator.name.includes("xpath") ||
+                    trimmedSelector.startsWith("//")) &&
+                  !locator.type.match("dynamic")
                 ) {
                   targetElement = getElementFromXPath(tempDiv, trimmedSelector);
                 } else {
@@ -317,7 +365,11 @@ const getElementsFromHTML = (
                   }
                 }
 
-                if (!targetElement && isSVGElement(currentElement)) {
+                if (
+                  !targetElement &&
+                  isSVGElement(currentElement) &&
+                  !locator.type.match("dynamic")
+                ) {
                   targetElement = currentElement.querySelector(trimmedSelector);
                 }
 
@@ -328,7 +380,11 @@ const getElementsFromHTML = (
 
           const locatorExists = (name: string, value: string) => {
             return finalLocators.some(
-              (loc) => loc.name === name && loc.value === value
+              (loc) =>
+                loc.name === name &&
+                loc.value === value &&
+                (!loc.value.includes("dynamic") ||
+                  !locator.type.match("dynamic"))
             );
           };
 
@@ -340,7 +396,6 @@ const getElementsFromHTML = (
             { name: "xpath", value: getXpathByName },
             { name: "xpath", value: getXpathByPlaceholder },
             { name: "xpath", value: getXpathByType },
-            { name: "xpath", value: getVisibleText },
           ];
 
           if (targetElement) {
@@ -355,6 +410,30 @@ const getElementsFromHTML = (
                 isRecorded: locator.isRecorded,
               });
             }
+            if (getVisibleText(targetElement)) {
+              const textValue = getVisibleText(targetElement);
+              finalLocators.push({
+                name: "linkText",
+                type: "static",
+                value: textValue,
+                reference: locator.reference,
+                status: locator.status,
+                isRecorded: locator.isRecorded,
+              });
+            }
+
+            if (getName(targetElement)) {
+              console.log("inside name if");
+              const nameLocator = getName(targetElement);
+              finalLocators.push({
+                name: "name",
+                type: "static",
+                value: nameLocator,
+                reference: locator.reference,
+                status: locator.status,
+                isRecorded: locator.isRecorded,
+              });
+            }
 
             const classValue = getClassName(targetElement);
             if (