ff-dom 1.0.14 → 1.0.16

package/dist/utils/getElementsFromHTML.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementsFromHTML = void 0;
+//@ts-nocheck
 const jsdom_1 = require("jsdom");
 const isUnique = (xpathResult) => {
     return xpathResult && xpathResult.snapshotLength === 1;
@@ -477,14 +478,17 @@ const getElementsFromHTML = (name, desc, type, locators, isShared, projectId, pr
                             }
                         }
                         let uniqueLocators = new Map();
-                        finalLocators.forEach((loc) => {
-                            if (loc.isRecorded === "N") {
-                                uniqueLocators.set(loc.value, loc);
+                        finalLocators.forEach((obj) => {
+                            let val = obj.value;
+                            if (obj.isRecorded === 'Y' && val) {
+                                val = String(val).replace(/"/g, "'").replace(/\\'/g, "'");
                             }
-                            else {
-                                if (!uniqueLocators.has(loc.value)) {
-                                    uniqueLocators.set(loc.value, loc);
-                                }
+                            // filter out redundant/invalid values
+                            if (!val || val === 'null' || val === "''")
+                                return;
+                            // ensure unique entries
+                            if (!uniqueLocators.has(val)) {
+                                uniqueLocators.set(val, { ...obj, value: val });
                             }
                         });
                         let ffLoc = Array.from(uniqueLocators.values());

package/package.json

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

package/src/utils/getElementsFromHTML.ts

@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { JSDOM, VirtualConsole } from "jsdom";
 
 type ElementDetails = {
@@ -623,13 +624,19 @@ const getElementsFromHTML = (
             }
 
             let uniqueLocators = new Map();
-            finalLocators.forEach((loc) => {
-              if (loc.isRecorded === "N") {
-                uniqueLocators.set(loc.value, loc);
-              } else {
-                if (!uniqueLocators.has(loc.value)) {
-                  uniqueLocators.set(loc.value, loc);
-                }
+
+             finalLocators.forEach((obj) => {
+              let val = obj.value;
+              if (obj.isRecorded === 'Y' && val) {
+                val = String(val).replace(/"/g, "'").replace(/\\'/g, "'");
+              }
+
+              // filter out redundant/invalid values
+              if (!val || val === 'null' || val === "''") return;
+
+              // ensure unique entries
+              if (!uniqueLocators.has(val)) {
+                uniqueLocators.set(val, { ...obj, value: val });
               }
             });