@dev-blinq/cucumber_client 1.0.1236-dev → 1.0.1238-dev

package/bin/assets/preload/recorderv3.js

@@ -919,6 +919,63 @@ class BVTRecorder {
     }
     this.contextElement = null;
   }
+  getElementProperties(element) {
+    if (!element || !(element instanceof HTMLElement)) {
+      throw new Error("Please provide a valid HTML element");
+    }
+
+    const result = {
+      properties: {},
+      attributes: {},
+      dataset: {},
+    };
+
+    const unsortedProperties = {};
+    const unsortedAttributes = {};
+    const unsortedDataset = {};
+
+    // Get enumerable properties
+    for (const prop in element) {
+      try {
+        const value = element[prop];
+        if (
+          typeof value !== "function" &&
+          typeof value !== "object" &&
+          value !== null &&
+          value !== undefined &&
+          !prop.includes("_")
+        ) {
+          unsortedProperties[prop] = value;
+        }
+      } catch (error) {
+        unsortedProperties[prop] = "[Error accessing property]";
+      }
+    }
+
+    // Get all attributes
+    if (element.attributes) {
+      for (const attr of element.attributes) {
+        unsortedAttributes[attr.name] = attr.value;
+      }
+    }
+
+    // Get dataset properties (data-* attributes)
+    if (element.dataset) {
+      for (const [key, value] of Object.entries(element.dataset)) {
+        unsortedDataset[key] = value;
+      }
+    }
+
+    // Sort each object by key
+    const sortByKey = (obj) => Object.fromEntries(Object.entries(obj).sort(([a], [b]) => a.localeCompare(b)));
+
+    result.properties = sortByKey(unsortedProperties);
+    result.attributes = sortByKey(unsortedAttributes);
+    result.dataset = sortByKey(unsortedDataset);
+
+    return result;
+  }
+
   getElementDetails(el, type) {
     if (lastInputId !== el.dataset.inputId || type !== "input") {
       el.dataset.inputId = getNextInputId();
@@ -933,11 +990,7 @@ class BVTRecorder {
     }
     const role = window.getAriaRole(el);
     const label = window.getElementAccessibleName(el, false) || window.getElementAccessibleName(el, true) || role || "";
-    const attrs2 = {};
-    for (var att, i = 0, atts = el.attributes, n = atts.length; i < n; i++) {
-      const att = atts[i];
-      attrs2[att.nodeName] = att.nodeValue;
-    }
+    const result = this.getElementProperties(el);
     return {
       role,
       label,
@@ -961,7 +1014,9 @@ class BVTRecorder {
         checked: el.checked,
         innerText: el.innerText,
       },
-      allAttributes: attrs2,
+      attributes: result.attributes,
+      properties: result.properties,
+      dataset: result.dataset,
     };
   }
   handleEvent(e) {

package/bin/client/code_gen/playwright_codeget.js

@@ -47,6 +47,7 @@ const _isCodeGenerationStep = (step) => {
     step.type === Types.SELECT ||
     step.type === Types.HOVER ||
     step.type === Types.EXTRACT_ATTRIBUTE ||
+    step.type === Types.EXTRACT_PROPERTY ||
     step.type === Types.SET_DATE_TIME ||
     step.type === Types.CHECK ||
     step.type === Types.PRESS ||
@@ -55,6 +56,7 @@ const _isCodeGenerationStep = (step) => {
     step.type === "context_click" ||
     step.type === "parameterized_click" ||
     step.type === Types.VERIFY_ATTRIBUTE ||
+    step.type === Types.VERIFY_PROPERTY ||
     step.type === Types.SET_INPUT_FILES ||
     step.type === Types.VERIFY_PAGE_SNAPSHOT
   ) {
@@ -164,6 +166,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
   let variable = null;
   let format = null;
   let options = null;
+  let property = null;
   switch (step.type) {
     case Types.SET_INPUT:
       line = `await context.web.setInputValue(elements["${elementIdentifier}"], `;
@@ -293,6 +296,30 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       break;
     }
+    case Types.EXTRACT_PROPERTY: {
+      property = escapeNonPrintables(step.parameters[0]);
+      variable = escapeNonPrintables(step.parameters[1]);
+      input = `"${variable}"`;
+      if (step.dataSource === "userData" || step.dataSource === "parameters") {
+        input = "_" + step.dataKey;
+      }
+      let options = "null";
+      if (step.regex !== "") {
+        options = `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
+      } else if (step.trimSpaces) {
+        options = `{trimSpaces: ${step.trimSpaces}}`;
+      } else {
+        options = "null";
+      }
+      line = `await context.web.extractProperty(elements["${elementIdentifier}"], "${property}", ${input}, _params,${options}, this);`;
+
+      if (element_name) {
+        comment = `// Extract property ${property} from ${element_name} to ${variable}`;
+        codeLines.push(escapeNonPrintables(comment));
+      }
+      codeLines.push(line);
+      break;
+    }
     case Types.VERIFY_PAGE_SNAPSHOT:
       comment = step.nestFrmLoc
         ? `// Verify page snapshot ${step.parameters[0]} in the frame ${step.selectors.iframe_src}`
@@ -548,6 +575,16 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       break;
     }
+    case Types.VERIFY_PROPERTY: {
+      line = `await context.web.verifyProperty(elements["${elementIdentifier}"], `;
+      input = `"${escapeNonPrintables(step.parameters[1].replaceAll('"', '\\"'))}"`;
+      if (step.dataSource === "userData" || step.dataSource === "parameters") {
+        input = "_" + step.dataKey;
+      }
+      line += `"${step.parameters[0]}", ${input}, _params, null, this);`;
+      codeLines.push(line);
+      break;
+    }
     case Types.SET_INPUT_FILES: {
       line = `await context.web.setInputFiles(elements["${elementIdentifier}"], `;
       let files = step.parameters[0];

package/bin/client/recording.js

@@ -30,6 +30,7 @@ const Types = {
   SET_COMBO: "set_combo",
   HOVER: "hover_element",
   EXTRACT_ATTRIBUTE: "extract_attribute",
+  EXTRACT_PROPERTY: "extract_property",
   CLOSE_PAGE: "close_page",
   SET_DATE_TIME: "set_date_time",
   SET_VIEWPORT: "set_viewport",
@@ -41,6 +42,7 @@ const Types = {
   SET_INPUT: "set_input",
   WAIT_FOR_USER_INPUT: "wait_for_user_input",
   VERIFY_ATTRIBUTE: "verify_element_attribute",
+  VERIFY_PROPERTY: "verify_element_property",
   FILL_UNKNOWN: "fill_unknown",
   VERIFY_TEXT_RELATED_TO_TEXT: "verify_text_in_relation",
   VERIFY_FILE_EXISTS: "verify_file_exists",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1236-dev",
+  "version": "1.0.1238-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -28,7 +28,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.173-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.741-dev",
+    "automation_model": "1.0.742-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",