@dev-blinq/cucumber_client 1.0.1475-dev → 1.0.1475-stage

package/bin/client/code_gen/playwright_codeget.js

@@ -5,6 +5,8 @@ import path from "path";
 import { CodePage } from "./page_reflection.js";
 import { convertToIdentifier, escapeNonPrintables } from "./utils.js";
 import socketLogger from "../utils/socket_logger.js";
+import fs from "fs";
+
 const findElementIdentifier = (node, step, userData, elements) => {
   if (node.key) {
     // incase of rerunning implemented steps
@@ -47,6 +49,7 @@ const findElementIdentifier = (node, step, userData, elements) => {
   return elementIdentifier;
 };
 const _isCodeGenerationStep = (step) => {
+  return true;
   if (
     step.type === Types.CLICK ||
     step.type === Types.FILL ||
@@ -67,18 +70,54 @@ const _isCodeGenerationStep = (step) => {
     step.type === Types.VERIFY_PROPERTY ||
     step.type === Types.SET_INPUT_FILES ||
     step.type === Types.VERIFY_PAGE_SNAPSHOT ||
-    step.type === Types.CONDITIONAL_WAIT
+    step.type === Types.CONDITIONAL_WAIT ||
+    step.type === Types.CLOSE_PAGE
   ) {
     return true;
   }
   return false;
 };
+
+const _isLocatorStrategyStep = (step) => {
+  switch (step.type) {
+    case Types.VERIFY_PAGE_SNAPSHOT:
+    case Types.CLOSE_PAGE:
+    case Types.VERIFY_FILE_EXISTS:
+    case Types.VERIFY_PAGE_CONTAINS_NO_TEXT:
+    case Types.VERIFY_PAGE_CONTAINS_TEXT:
+    case Types.VERIFY_PAGE_PATH:
+    case Types.VERIFY_PAGE_TITLE:
+    case Types.VERIFY_TEXT_RELATED_TO_TEXT:
+    case Types.NAVIGATE:
+    case Types.RELOAD:
+    case Types.GO_BACK:
+    case Types.GO_FORWARD:
+    case Types.SLEEP:
+    case Types.SET_VIEWPORT:
+    case Types.VISUAL_VERIFICATION:
+    case Types.LOAD_DATA:
+    case Types.MAIL_GET_CODE_OR_URL:
+    case Types.ASK:
+    case Types.WAIT_FOR_USER_INPUT:
+    case Types.COMPLETE:
+    case Types.CLICK_SIMPLE:
+    case Types.FILL_SIMPLE:
+    case Types.API:
+      return false;
+    default:
+      return true;
+  }
+};
 // Note: this function is used to exclude a key from an object
 // Please move it to utils and use it as a reusable function  ...
 function excludeKey(obj, keyToRemove) {
   const { [keyToRemove]: _, ...rest } = obj;
   return rest;
 }
+/**
+ * Split locators by strategy
+ * @param {import("../types/locators").LocatorBundle} locators
+ */
 const splitToLocatorsGroups = (locators) => {
   const no_text = locators.locators.filter((locator) => locator.mode === "NO_TEXT");
   const ignore_digit = locators.locators.filter((locator) => locator.mode === "IGNORE_DIGIT");
@@ -97,6 +136,20 @@ const splitToLocatorsGroups = (locators) => {
   });
   return { basic, no_text, ignore_digit, context };
 };
+
+const serializeOptions = (options, context) => {
+  if (!options) return "null";
+  if (typeof options !== "object") return "null";
+  if (Array.isArray(options)) return "null";
+  let result = "{ ";
+  if (context) result += `"context": ${context}, `;
+  for (const key in options) {
+    result += `"${key}": ${JSON.stringify(options[key])}, `;
+  }
+  result += " }";
+  return result;
+};
+
 const _generateCodeFromCommand = (step, elements, userData) => {
   let elementsChanged = false;
 
@@ -105,7 +158,12 @@ const _generateCodeFromCommand = (step, elements, userData) => {
   // handle element
   let element_name = null;
   let allStrategyLocators = null;
-  if (_isCodeGenerationStep(step) && step.type !== Types.VERIFY_PAGE_SNAPSHOT) {
+  const codeLines = [];
+
+  if (_isCodeGenerationStep(step) === false)
+    return { codeLines, elements: elementsChanged ? elements : null, elementIdentifier, allStrategyLocators };
+
+  if (_isCodeGenerationStep(step) && _isLocatorStrategyStep(step)) {
     allStrategyLocators = step.allStrategyLocators ?? splitToLocatorsGroups(step.locators);
     let node = null;
 
@@ -167,8 +225,6 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
   }
 
-  const codeLines = [];
-
   let line = null;
   let comment = null;
   let input = null;
@@ -176,7 +232,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
   let attribute = null;
   let variable = null;
   let format = null;
-  let options = null;
+  let options = step.options ?? null;
   let property = null;
   switch (step.type) {
     case Types.SET_INPUT:
@@ -186,7 +242,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
         //parameters.push(step.dataKey);
         input = "_" + step.dataKey;
       }
-      line += `${input}, _params, null, this);`;
+      line += `${input}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Set ${element_name} to ${input}`;
         codeLines.push(escapeNonPrintables(comment));
@@ -199,7 +255,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
           comment = `// Check ${element_name}`;
           codeLines.push(escapeNonPrintables(comment));
         }
-        line = `await context.web.setCheck(elements["${elementIdentifier}"], ${step.check}, _params, null, this);`;
+        line = `await context.web.setCheck(elements["${elementIdentifier}"], ${step.check}, _params, ${serializeOptions(options)}, this);`;
         codeLines.push(line);
       } else {
         switch (step.count) {
@@ -208,7 +264,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
               comment = `// Click on ${element_name}`;
               codeLines.push(escapeNonPrintables(comment));
             }
-            line = `await context.web.click(elements["${elementIdentifier}"], _params, null, this);`;
+            line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
             codeLines.push(line);
             break;
           case 2:
@@ -216,7 +272,9 @@ const _generateCodeFromCommand = (step, elements, userData) => {
               comment = `// Double click on ${element_name}`;
               codeLines.push(escapeNonPrintables(comment));
             }
-            line = `await context.web.click(elements["${elementIdentifier}"], _params, {clickCount:2}, this);`;
+            options = options ?? {};
+            options.clickCount = 2;
+            line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
             codeLines.push(line);
             break;
           default:
@@ -224,7 +282,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
               comment = `// Click on ${element_name}`;
               codeLines.push(escapeNonPrintables(comment));
             }
-            line = `await context.web.click(elements["${elementIdentifier}"], _params, null, this);`;
+            line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
             codeLines.push(line);
             break;
         }
@@ -235,17 +293,19 @@ const _generateCodeFromCommand = (step, elements, userData) => {
         case 1:
           comment = `//  Parameterized click on ${step.value}`;
           codeLines.push(escapeNonPrintables(comment));
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, null, this);`;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
           break;
         case 2:
           comment = `//  Parameterized double click on ${step.value}`;
           codeLines.push(escapeNonPrintables(comment));
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, {clickCount:2}, this);`;
+          options = options ?? {};
+          options.clickCount = 2;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
           break;
         default:
           comment = `//  Parameterized click on ${step.value}`;
           codeLines.push(escapeNonPrintables(comment));
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, null, this);`;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
       }
       codeLines.push(line);
       break;
@@ -264,7 +324,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       } else {
         enter = '"' + step.parameters[2] + '"';
       }
-      line += `${input}, "${format}", ${enter}, _params, null, this);`;
+      line += `${input}, "${format}", ${enter}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Set date time ${element_name} to "${input}" with format "${format}"`;
         codeLines.push(escapeNonPrintables(comment));
@@ -286,7 +346,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       } else {
         enter = '"' + step.parameters[1] + '"';
       }
-      line += `${input}, ${enter}, _params, null, this);`;
+      line += `${input}, ${enter}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Fill ${element_name} with "${input}"`;
         codeLines.push(escapeNonPrintables(comment));
@@ -308,7 +368,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       } else {
         enter = '"' + step.parameters[1] + '"';
       }
-      line += `${input}, ${enter}, _params, null, this);`;
+      line += `${input}, ${enter}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Fill ${element_name} with "${input}"`;
         codeLines.push(escapeNonPrintables(comment));
@@ -322,15 +382,25 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      let options = "null";
+      // let options = "null";
       if (step.regex !== "") {
-        options = `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
+        options = options ?? {};
+        options = {
+          ...options,
+          regex: step.regex,
+          trimSpaces: step.trimSpaces,
+        }; // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
       } else if (step.trimSpaces) {
-        options = `{trimSpaces: ${step.trimSpaces}}`;
+        options = options ?? {};
+        options = {
+          ...options,
+          trimSpaces: step.trimSpaces,
+        };
+        // options = `{trimSpaces: ${step.trimSpaces}}`;
       } else {
-        options = "null";
+        options = null; //"null";
       }
-      line = `await context.web.extractAttribute(elements["${elementIdentifier}"], "${attribute}", ${input}, _params,${options}, this);`;
+      line = `await context.web.extractAttribute(elements["${elementIdentifier}"], "${attribute}", ${input}, _params, ${serializeOptions(options)}, this);`;
 
       if (element_name) {
         comment = `// Extract attribute ${attribute} from ${element_name} to ${variable}`;
@@ -346,15 +416,24 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       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}}`;
+        options = options ?? {};
+        options = {
+          ...options,
+          regex: step.regex,
+          trimSpaces: step.trimSpaces,
+        }; // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
       } else if (step.trimSpaces) {
-        options = `{trimSpaces: ${step.trimSpaces}}`;
+        options = options ?? {};
+        options = {
+          ...options,
+          trimSpaces: step.trimSpaces,
+        };
+        // options = `{trimSpaces: ${step.trimSpaces}}`;
       } else {
-        options = "null";
+        options = null; //"null";
       }
-      line = `await context.web.extractProperty(elements["${elementIdentifier}"], "${property}", ${input}, _params,${options}, this);`;
+      line = `await context.web.extractProperty(elements["${elementIdentifier}"], "${property}", ${input}, _params, ${serializeOptions(options)}, this);`;
 
       if (element_name) {
         comment = `// Extract property ${property} from ${element_name} to ${variable}`;
@@ -363,23 +442,40 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       break;
     }
-    case Types.VERIFY_PAGE_SNAPSHOT:
+    case Types.VERIFY_PAGE_SNAPSHOT: {
       comment = step.nestFrmLoc
         ? `// Verify page snapshot ${step.parameters[0]} in the frame ${step.selectors.iframe_src}`
         : `// Verify page snapshot ${step.parameters[0]}`;
       codeLines.push(escapeNonPrintables(comment));
       line = `const frameLocator = ${JSON.stringify(step.selectors ?? null)}`;
       codeLines.push(line);
-      line = `await context.web.snapshotValidation(frameLocator, _param_0 , _params, ${JSON.stringify(options)}, this);`;
+      line = `await context.web.snapshotValidation(frameLocator,${step.valueInStepText ? "_param_0" : `"${step.parameters[0]}"`}, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
+
+      const data = step.data;
+      if (data) {
+        try {
+          const { snapshot, fileName, filePath } = data;
+          const folderPath = process.env.BVT_TEMP_SNAPSHOTS_FOLDER ?? filePath;
+          const filePathWithName = path.join(folderPath, fileName);
+          if (!fs.existsSync(folderPath)) {
+            fs.mkdirSync(folderPath, { recursive: true });
+          }
+          fs.writeFileSync(filePathWithName, snapshot, "utf-8");
+        } catch (e) {
+          console.log(`Error saving snapshot file: ${e}`);
+          throw e;
+        }
+      }
       break;
+    }
     case Types.VERIFY_PAGE_CONTAINS_TEXT:
       line = "await context.web.verifyTextExistInPage( ";
       input = `${escapeNonPrintables(JSON.stringify(step.parameters[0]))}`;
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `${input}, null, this);`;
+      line += `${input}, ${serializeOptions(options)}, this);`;
       comment = `// Verify page contains text "${input}"`;
       codeLines.push(escapeNonPrintables(comment));
       codeLines.push(line);
@@ -393,7 +489,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `${input}, ${step.parameters[1]} ,_params, null, this);`;
+      line += `${input}, ${step.parameters[1]} , _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Verify ${element_name} contains text "${input}"`;
         codeLines.push(escapeNonPrintables(comment));
@@ -408,7 +504,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       }
       line = `await context.web.analyzeTable(elements["${elementIdentifier}"], ${JSON.stringify(
         step.parameters[0]
-      )}, "${step.parameters[1]}", ${input}, _params, null, this);`;
+      )}, "${step.parameters[1]}", ${input}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Analyze table ${element_name} query ${JSON.stringify(
           step.parameters[0]
@@ -428,27 +524,27 @@ const _generateCodeFromCommand = (step, elements, userData) => {
         } else if (step.dataSource === "environment") {
           input = `context.environment["_${step.dataKey}"]`;
         }
-        line += `${input}, _params, null, this);`;
+        line += `${input}, _params, ${serializeOptions(options)}, this);`;
         if (element_name) {
           comment = `// Select "${input}" from ${element_name}`;
           codeLines.push(escapeNonPrintables(comment));
         }
         codeLines.push(line);
       } else if (step.selectMode === "click_combo") {
-        line = `await context.web.click(elements["${elementIdentifier}"], _params, null, this);`;
+        line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
         if (element_name) {
           comment = `// Open combobox ${element_name}`;
           codeLines.push(escapeNonPrintables(comment));
         }
         codeLines.push(line);
-        line = `await context.web.click(elements["${optionIdentifier}"], _params, null, this);`;
+        line = `await context.web.click(elements["${optionIdentifier}"], _params, ${serializeOptions(options)}, this);`;
         if (element_name) {
           comment = `// Select "${optionIdentifier}" from ${element_name}`;
           codeLines.push(escapeNonPrintables(comment));
         }
         codeLines.push(line);
       } else if (step.selectMode === "click") {
-        line = `await context.web.click(elements["${optionIdentifier}"], _params, null, this);`;
+        line = `await context.web.click(elements["${optionIdentifier}"], _params, ${serializeOptions(options)}, this);`;
         if (element_name) {
           comment = `// Select ${optionIdentifier} from ${element_name}`;
           codeLines.push(escapeNonPrintables(comment));
@@ -461,13 +557,13 @@ const _generateCodeFromCommand = (step, elements, userData) => {
         if (step.dataSource === "userData" || step.dataSource === "parameters") {
           input = "_" + step.dataKey;
         }
-        line += `${input}, false, _params, null, this);`;
+        line += `${input}, false, _params, ${serializeOptions(options)}, this);`;
         if (element_name) {
           comment = `// Fill ${element_name} with "${input}"`;
           codeLines.push(escapeNonPrintables(comment));
         }
         codeLines.push(line);
-        line = `await context.web.click(elements["${optionIdentifier}"], _params, null, this);`;
+        line = `await context.web.click(elements["${optionIdentifier}"], _params, ${serializeOptions(options)}, this);`;
         codeLines.push(line);
       } else {
         throw new Error(`Unknown select mode ${step.selectMode}`);
@@ -479,13 +575,13 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     case Types.RELOAD:
       comment = `// Reload page`;
       codeLines.push(escapeNonPrintables(comment));
-      line = "await context.web.reloadPage({}, this);";
+      line = `await context.web.reloadPage(${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     case Types.CLOSE_PAGE:
       comment = `// Close page`;
       codeLines.push(escapeNonPrintables(comment));
-      line = "await context.web.closePage({}, this);";
+      line = `await context.web.closePage(${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     case Types.NAVIGATE:
@@ -498,7 +594,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       } else if (step.dataSource === "environment") {
         input = `context.environment["_${step.dataKey}"]`;
       }
-      line = `await context.web.goto(${input}, this);`;
+      line = `await context.web.goto(${input}, this, ${serializeOptions(options)});`;
       codeLines.push(line);
       break;
     case Types.VERIFY_PAGE_PATH:
@@ -507,7 +603,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `${input}, null, this);`;
+      line += `${input}, ${serializeOptions(options)}, this);`;
       comment = `// Verify page path "${input}"`;
       codeLines.push(escapeNonPrintables(comment));
       codeLines.push(line);
@@ -518,7 +614,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `${input}, null, this);`;
+      line += `${input}, ${serializeOptions(options)}, this);`;
       comment = `// Verify page title "${input}"`;
       codeLines.push(escapeNonPrintables(comment));
       codeLines.push(line);
@@ -528,13 +624,13 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line = `await context.web.type(${input}, _params, null, this);`;
+      line = `await context.web.type(${input}, _params, ${serializeOptions(options)}, this);`;
       comment = `// Type "${input}"`;
       codeLines.push(escapeNonPrintables(comment));
       codeLines.push(line);
       break;
     case Types.HOVER:
-      line = `await context.web.hover(elements["${elementIdentifier}"], _params, null, this);`;
+      line = `await context.web.hover(elements["${elementIdentifier}"], _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Hover ${element_name}`;
         codeLines.push(escapeNonPrintables(comment));
@@ -575,13 +671,15 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     case Types.CHECK:
       comment = `// Check ${element_name}`;
       codeLines.push(escapeNonPrintables(comment));
-      line = `await context.web.setCheck(elements["${elementIdentifier}"], ${step.check}, _params, null, this);`;
+      line = `await context.web.setCheck(elements["${elementIdentifier}"], ${step.check}, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     case Types.PRESS:
       comment = `// Press ${step.key}`;
       codeLines.push(escapeNonPrintables(comment));
-      line = `await context.web.clickType( elements["${elementIdentifier}"] ,"${step.key}",null, _params, {"press":true}, this);`;
+      options = options ?? {};
+      options.press = true;
+      line = `await context.web.clickType( elements["${elementIdentifier}"] ,"${step.key}",null, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     case Types.CONTEXT_CLICK:
@@ -593,7 +691,9 @@ const _generateCodeFromCommand = (step, elements, userData) => {
           if (step.dataSource === "userData" || step.dataSource === "parameters") {
             input = "_" + step.dataKey;
           }
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, {"context": ${input}}, this);`;
+          options = options ?? {};
+          // options.context = input;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options, input)}, this);`;
           codeLines.push(line);
           break;
         case 2:
@@ -603,7 +703,10 @@ const _generateCodeFromCommand = (step, elements, userData) => {
           if (step.dataSource === "userData" || step.dataSource === "parameters") {
             input = "_" + step.dataKey;
           }
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, {"context": ${input}, clickCount:2}, this);`;
+          options = options ?? {};
+          // options.context = input;
+          options.clickCount = 2;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options, input)}, this);`;
           codeLines.push(line);
           break;
         default:
@@ -613,7 +716,9 @@ const _generateCodeFromCommand = (step, elements, userData) => {
           if (step.dataSource === "userData" || step.dataSource === "parameters") {
             input = "_" + step.dataKey;
           }
-          line = `await context.web.click(elements["${elementIdentifier}"], _params, {"context": ${input}}, this);`;
+          options = options ?? {};
+          // options.context = input;
+          line = `await context.web.click(elements["${elementIdentifier}"], _params, ${serializeOptions(options, input)}, this);`;
           codeLines.push(line);
           break;
       }
@@ -638,24 +743,25 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `"${step.parameters[0]}", ${input}, _params, null, this);`;
+      line += `"${step.parameters[0]}", ${input}, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     }
     case Types.VERIFY_PROPERTY: {
       line = `await context.web.verifyProperty(elements["${elementIdentifier}"], `;
-      input = "_param_0";
+      input = step.valueInStepText ? "_param_0" : `"${escapeNonPrintables(step.parameters[1].replaceAll('"', '\\"'))}"`;
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `"${step.parameters[0]}", ${input}, _params, null, this);`;
+      line += `"${step.parameters[0]}", ${input}, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     }
     case Types.CONDITIONAL_WAIT: {
       line = `await context.web.conditionalWait(elements["${elementIdentifier}"], `;
-      input = "_param_0";
-      line += `"${step.parameters[1]}", ${input}, _params, null, this);`;
+      const timeout = Number(step.parameters[0]) / 1000;
+      input = step.valueInStepText ? "_param_0" : `"${escapeNonPrintables(String(timeout))}"`;
+      line += `"${step.parameters[1]}", ${input}, _params, ${serializeOptions(options)}, this);`;
       codeLines.push(line);
       break;
     }
@@ -666,7 +772,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
-      line += `${input}, _params, null, this);`;
+      line += `${input}, _params, ${serializeOptions(options)}, this);`;
       if (element_name) {
         comment = `// Set ${element_name} to ${input}`;
         codeLines.push(escapeNonPrintables(comment));
@@ -674,6 +780,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(line);
       break;
     }
+
     case Types.CLICK_SIMPLE:
     case Types.FILL_SIMPLE:
       // no code need to be added
@@ -684,22 +791,6 @@ const _generateCodeFromCommand = (step, elements, userData) => {
   return { codeLines, elements: elementsChanged ? elements : null, elementIdentifier, allStrategyLocators };
 };
 
-/**
- * Generates a report command based on the given position.
- * @param {"start"|"end"} position
- */
-const generateReportCommand = (position, cmdId) => {
-  const codeLines = [];
-  if (position === "start") {
-    const line = `await context.web.addCommandToReport("${cmdId}", "PASSED", '{"status":"start","cmdId":"${cmdId}"}', {type:"cmdReport"},this);`;
-    codeLines.push(line);
-  } else if (position === "end") {
-    const line = `await context.web.addCommandToReport("${cmdId}", "PASSED", '{"status":"end","cmdId":"${cmdId}"}', {type:"cmdReport"},this);`;
-    codeLines.push(line);
-  }
-  return codeLines;
-};
-
 const generateCode = (recording, codePage, userData, projectDir, methodName) => {
   const stepsDefinitions = new StepsDefinitions(projectDir);
   stepsDefinitions.load(false);
@@ -722,12 +813,10 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
       codePage = new CodePage(mjsFullPath);
       codePage.generateModel();
     }
-    //console.log("step found");
   }
   let elements = {};
   if (!codePage) {
-    socketLogger.info("CodePage is null");
-    console.log("codePage is null");
+    socketLogger.info("CodePage is null", undefined, "generateCode");
   } else {
     elements = codePage.getVariableDeclarationAsObject("elements");
   }
@@ -741,6 +830,7 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
     if (recordingStep.type === Types.COMPLETE) {
       return;
     }
+    socketLogger.info(`Generating code for step: ${recordingStep.type}`, undefined, "generateCode");
 
     // if (process.env.TEMP_RUN === "true") {
     //   codeLines.push(...generateReportCommand("start", recordingStep.cmdId));
@@ -752,9 +842,11 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
     //   codeLines.push(...generateReportCommand("end", recordingStep.cmdId));
     // }
     if (result.elements) {
+      socketLogger.info(`Updating elements with ${Object.keys(result.elements)}`, undefined, "generateCode");
       elements = result.elements;
     }
     if (result.elementIdentifier) {
+      socketLogger.info(`Adding locator metadata for ${result.elementIdentifier}`, undefined, "generateCode");
       locatorsMetadata[result.elementIdentifier] = result.allStrategyLocators;
     }
   });
@@ -768,7 +860,11 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
     locatorsMetadata,
   };
 };
-const generatePageName = (url) => {
+const generatePageName = (url, isUtilStep) => {
+  if (isUtilStep) {
+    return "renamed_util";
+  }
+
   try {
     let pathname = url;
     try {
@@ -791,8 +887,8 @@ const generatePageName = (url) => {
     }
     // join by _
     return lowerCaseParts.join("_");
-  } catch (err) {
+  } catch {
     return "default";
   }
 };
-export { generateCode, generatePageName };
+export { generateCode, generatePageName, _generateCodeFromCommand };