ff-dom 1.0.7 → 1.0.9

package/dist/utils/getElementsFromHTML.js

@@ -179,10 +179,11 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
     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("}")) {
+            const isDynamic = String(locator.value || locator.type || "");
+            if (isDynamic.includes("dynamic") ||
+                isDynamic.match("dynamic") ||
+                isDynamic.includes("{") ||
+                isDynamic.includes("}")) {
                 finalLocators.push({
                     name: locator.name,
                     type: locator.type,
@@ -193,7 +194,8 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                 });
                 continue;
             }
-            if (locator.isRecorded.includes("N") || locator.isRecorded.match("N")) {
+            const isRecorded = String(locator.isRecorded || "");
+            if (isRecorded.includes("N") || isRecorded.match("N")) {
                 finalLocators.push({
                     name: locator.name,
                     type: locator.type,
@@ -202,7 +204,6 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                     status: locator.status,
                     isRecorded: locator.isRecorded,
                 });
-                continue;
             }
             if (isShared.includes("Y")) {
                 break locators;
@@ -429,12 +430,19 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                                 console.error("Error processing locator:", locator, error);
                             }
                         }
+                        let uniqueLocators = new Map();
+                        finalLocators.forEach((loc) => {
+                            if (!uniqueLocators.has(loc.value)) {
+                                uniqueLocators.set(loc.value, loc);
+                            }
+                        });
+                        let ffLoc = Array.from(uniqueLocators.values());
                         const jsonResult = [
                             {
                                 name: `${name}`,
                                 desc: `${desc}`,
                                 type: `${type}`,
-                                locators: finalLocators.filter((locator) => locator.hasOwnProperty("value") &&
+                                locators: ffLoc.filter((locator) => locator.hasOwnProperty("value") &&
                                     (locator === null || locator === void 0 ? void 0 : locator.value) !== null &&
                                     locator.value !== ""),
                                 isShared: `${isShared}`,

package/package.json

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

package/src/utils/getElementsFromHTML.ts

@@ -279,11 +279,12 @@ const getElementsFromHTML = (
   locators: for (const locator of locators) {
     try {
       let relativeXpath: string | null = null;
+      const isDynamic = String(locator.value || locator.type || "");
       if (
-        locator.value.includes("dynamic") ||
-        locator.type.match("dynamic") ||
-        locator.value.includes("{") ||
-        locator.value.includes("}")
+        isDynamic.includes("dynamic") ||
+        isDynamic.match("dynamic") ||
+        isDynamic.includes("{") ||
+        isDynamic.includes("}")
       ) {
         finalLocators.push({
           name: locator.name,
@@ -295,7 +296,10 @@ const getElementsFromHTML = (
         });
         continue;
       }
-      if (locator.isRecorded.includes("N") || locator.isRecorded.match("N")) {
+      const isRecorded = String(locator.isRecorded || "");
+
+      if (isRecorded.includes("N") || isRecorded.match("N")) {
+       
         finalLocators.push({
           name: locator.name,
           type: locator.type,
@@ -304,7 +308,6 @@ const getElementsFromHTML = (
           status: locator.status,
           isRecorded: locator.isRecorded,
         });
-        continue;
       }
       if (isShared.includes("Y")) {
         break locators;
@@ -561,12 +564,22 @@ const getElementsFromHTML = (
                 console.error("Error processing locator:", locator, error);
               }
             }
+
+            let uniqueLocators = new Map();
+            finalLocators.forEach((loc) => {
+              if (!uniqueLocators.has(loc.value)) {
+                uniqueLocators.set(loc.value, loc);
+              }
+            });
+
+            let ffLoc = Array.from(uniqueLocators.values());
+
             const jsonResult = [
               {
                 name: `${name}`,
                 desc: `${desc}`,
                 type: `${type}`,
-                locators: finalLocators.filter(
+                locators: ffLoc.filter(
                   (locator) =>
                     locator.hasOwnProperty("value") &&
                     locator?.value !== null &&