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

package/bin/assets/templates/_hooks_template.txt

@@ -1,3 +1,7 @@
+import dotenv from "dotenv";
+// Load .env into process.env
+dotenv.config();
+
 import {
   After,
   setDefaultTimeout,
@@ -30,8 +34,8 @@ BeforeStep(async function (step) {
   }
 });
 
-AfterStep(async function (step) {
+AfterStep(async function ({ result, pickleStep }) {
   if (context) {
-    await context.web.afterStep(this, step);
+    await context.web.afterStep(this, pickleStep, result);
   }
 });

package/bin/assets/templates/utils_template.txt

@@ -12,7 +12,7 @@ import path from "path";
  * @param {string} text the text to verify exists in page
  * @protect
  */
-async function verifyTextExistsInPage(text) {
+export async function verifyTextExistsInPage(text) {
   await context.web.verifyTextExistInPage(text, null, this);
 }
 Then("Verify the text {string} can be found in the page", verifyTextExistsInPage);
@@ -22,7 +22,7 @@ Then("Verify the text {string} can be found in the page", verifyTextExistsInPage
  * @param {string} elementDescription element description
  * @protect
  */
-async function clickOnElement(elementDescription) {
+export async function clickOnElement(elementDescription) {
   await context.web.simpleClick(elementDescription, null, null, this);
 }
 When("click on {string}", clickOnElement);
@@ -36,7 +36,7 @@ When("Click {string}", clickOnElement);
  * @param {string} value value to fill the element with
  * @protect
  */
-async function fillElement(elementDescription, value) {
+export async function fillElement(elementDescription, value) {
   await context.web.simpleClickType(elementDescription, value, null, null, this);
 }
 When("fill {string} with {string}", fillElement);
@@ -47,7 +47,7 @@ When("Fill {string} with {string}", fillElement);
  * @param {string} text the text to verify does not exist in page
  * @protect
  */
-async function verifyTextNotExistsInPage(text) {
+export async function verifyTextNotExistsInPage(text) {
   await context.web.waitForTextToDisappear(text, null, this);
 }
 Then("Verify the text {string} cannot be found in the page", verifyTextNotExistsInPage);
@@ -57,7 +57,7 @@ Then("Verify the text {string} cannot be found in the page", verifyTextNotExists
  * @param {string} url URL to navigate
  * @protect
  */
-async function navigateTo(url) {
+export async function navigateTo(url) {
   await context.web.goto(url, this);
 }
 When("Navigate to {string}", navigateTo);
@@ -66,7 +66,7 @@ When("Navigate to {string}", navigateTo);
  * Navigate to the current page
  * @protect
  */
-async function browserNavigateBack() {
+export async function browserNavigateBack() {
   await context.web.goBack({}, this);
 }
 Then("Browser navigate back", browserNavigateBack);
@@ -75,7 +75,7 @@ Then("Browser navigate back", browserNavigateBack);
  * Navigate forward in browser history
  * @protect
  */
-async function browserNavigateForward() {
+export async function browserNavigateForward() {
   await context.web.goForward({}, this);
 }
 Then("Browser navigate forward", browserNavigateForward);
@@ -85,7 +85,7 @@ Then("Browser navigate forward", browserNavigateForward);
  * @param {string} filePath the file path or empty to store in the test data file
  * @protect
  */
-async function storeBrowserSession(filePath) {
+export async function storeBrowserSession(filePath) {
   await context.web.saveStoreState(filePath, this);
 }
 When("Store browser session {string}", storeBrowserSession);
@@ -95,7 +95,7 @@ When("Store browser session {string}", storeBrowserSession);
  * @param {string} filePath the file path or empty
  * @protect
  */
-async function resetBrowserSession(filePath) {
+export async function resetBrowserSession(filePath) {
   await context.web.restoreSaveState(filePath, this);
 }
 When("Reset browser session {string}", resetBrowserSession);
@@ -107,7 +107,7 @@ When("Reset browser session {string}", resetBrowserSession);
  * @param {string} textToVerify the target text to verify
  * @protect
  */
-async function verifyTextRelatedToText(textAnchor, climb, textToVerify) {
+export async function verifyTextRelatedToText(textAnchor, climb, textToVerify) {
   await context.web.verifyTextRelatedToText(textAnchor, climb, textToVerify, null, this);
 }
 Then(
@@ -120,7 +120,7 @@ Then(
  * @requestName the name of the bruno request file
  * @protect
  */
-async function runBrunoRequest(requestName) {
+export async function runBrunoRequest(requestName) {
   await executeBrunoRequest(requestName, {}, context, this);
 }
 When("Bruno - {string}", runBrunoRequest);
@@ -131,7 +131,7 @@ When("bruno - {string}", runBrunoRequest);
  * @param {string} fileName the downloaded file to verify
  * @protect
  */
-async function verify_the_downloaded_file_exists(fileName) {
+export async function verify_the_downloaded_file_exists(fileName) {
   const downloadFolder = path.join(context.reportFolder, "downloads");
   const downloadFile = path.join(downloadFolder, fileName);
   await verifyFileExists(downloadFile, {}, context, this);
@@ -148,7 +148,7 @@ When("Noop", async function () {});
  * @param {string} url URL to be verified against current URL
  * @protect
  */
-async function verify_page_url(url) {
+export async function verify_page_url(url) {
   await context.web.verifyPagePath(url, {}, this);
 }
 Then("Verify the page url is {string}", verify_page_url);
@@ -158,7 +158,7 @@ Then("Verify the page url is {string}", verify_page_url);
  * @param {string} title Title to be verified against current Title
  * @protect
  */
-async function verify_page_title(title) {
+export async function verify_page_title(title) {
   await context.web.verifyPageTitle(title, {}, this);
 }
 Then("Verify the page title is {string}", verify_page_title);
@@ -170,7 +170,7 @@ Then("Verify the page title is {string}", verify_page_title);
  * @param {world} - Optional world context
  * @returns Promise that resolves after the specified duration
  */
-async function sleep(duration) {
-  await context.web.sleep(duration, {}, null);
+export async function sleep(duration) {
+  await context.web.sleep(duration, {}, this);
 }
 Then("Sleep for {string} ms", { timeout: -1 }, sleep);

package/bin/client/code_cleanup/find_step_definition_references.js

@@ -113,4 +113,3 @@ export const findStepDefinitionReferences = async (projectDir) => {
   }
   return referencesList;
 };
-

package/bin/client/code_cleanup/utils.js

@@ -10,7 +10,7 @@ import * as t from "@babel/types";
 import { CucumberExpression, ParameterTypeRegistry } from "@cucumber/cucumber-expressions";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { getAiConfig } from "../code_gen/page_reflection.js";
-import socketLogger from "../utils/socket_logger.js";
+import socketLogger, { getErrorMessage } from "../utils/socket_logger.js";
 
 const STEP_KEYWORDS = new Set(["Given", "When", "Then"]);
 
@@ -308,18 +308,27 @@ export function getDefaultPrettierConfig() {
       const configContent = readFileSync(prettierConfigPath, "utf-8");
       prettierConfig = JSON.parse(configContent);
     } catch (error) {
-      socketLogger.error("Error parsing Prettier config file", error);
-      console.error(`Error parsing Prettier config file: ${error}`);
+      socketLogger.error(
+        `Error parsing Prettier config file: ${getErrorMessage(error)}`,
+        undefined,
+        "getDefaultPrettierConfig"
+      );
     }
   } else {
     // save the default config to .prettierrc
     try {
       writeFileSync(prettierConfigPath, JSON.stringify(prettierConfig, null, 2), "utf-8");
-      socketLogger.info(`Created default Prettier config at ${prettierConfigPath}`);
-      console.log(`Created default Prettier config at ${prettierConfigPath}`);
+      socketLogger.info(
+        `Created default Prettier config at ${prettierConfigPath}`,
+        undefined,
+        "getDefaultPrettierConfig"
+      );
     } catch (error) {
-      socketLogger.error(`Error writing Prettier config file: ${error}`);
-      console.error(`Error writing Prettier config file: ${error}`);
+      socketLogger.error(
+        `Error writing Prettier config file: ${getErrorMessage(error)}`,
+        undefined,
+        "getDefaultPrettierConfig"
+      );
     }
   }
   return prettierConfig;

package/bin/client/code_gen/api_codegen.js

@@ -50,7 +50,7 @@ const generateApiCode = async (
     // create new codePage
     mjsFullPath = path.join(
       projectDir,
-      stepsDefinitions.isTemp ? process.env.tempFeaturesFolderPath ?? "__temp_features" : "features",
+      stepsDefinitions.isTemp ? (process.env.tempFeaturesFolderPath ?? "__temp_features") : "features",
       "step_definitions",
       `api_tests_page.mjs`
     );
@@ -60,7 +60,7 @@ const generateApiCode = async (
   if (!codePage) {
     mjsFullPath = path.join(
       projectDir,
-      stepsDefinitions.isTemp ? process.env.tempFeaturesFolderPath ?? "__temp_features" : "features",
+      stepsDefinitions.isTemp ? (process.env.tempFeaturesFolderPath ?? "__temp_features") : "features",
       "step_definitions",
       `api_tests_page.mjs`
     );

package/bin/client/code_gen/code_inversion.js

@@ -375,11 +375,13 @@ const invertStableCommand = (call, elements, stepParams) => {
     case "verifyTextRelatedToText": {
       step.type = Types.VERIFY_TEXT_RELATED_TO_TEXT;
       const textAnchorParse = parseDataSource(call.arguments[0], stepParams);
-      const textAnchor = textAnchorParse.type === "literal" ? textAnchorParse.value : toVariableName(textAnchorParse.dataKey);
+      const textAnchor =
+        textAnchorParse.type === "literal" ? textAnchorParse.value : toVariableName(textAnchorParse.dataKey);
       const climbParse = parseDataSource(call.arguments[1], stepParams);
       const climb = climbParse.type === "literal" ? climbParse.value : toVariableName(climbParse.dataKey);
       const textToVerifyParse = parseDataSource(call.arguments[2], stepParams);
-      const textToVerify = textToVerifyParse.type === "literal" ? textToVerifyParse.value : toVariableName(textToVerifyParse.dataKey);
+      const textToVerify =
+        textToVerifyParse.type === "literal" ? textToVerifyParse.value : toVariableName(textToVerifyParse.dataKey);
       step.parameters = [textAnchor, climb, textToVerify];
       break;
     }
@@ -473,6 +475,65 @@ const invertStableCommand = (call, elements, stepParams) => {
       }
       break;
     }
+
+    case "conditionalWait": {
+      step.type = Types.CONDITIONAL_WAIT;
+      step.element = extractElement(call.arguments[0]);
+      const condition = call.arguments[1].value;
+
+      const _timeout = parseDataSource(call.arguments[2], stepParams);
+      let timeout = 30;
+      if (_timeout.type === "literal") {
+        if (isNaN(_timeout.value)) {
+          throw new Error(`Timeout value must be a number, got ${_timeout.value}`);
+        }
+        timeout = Number(_timeout.value) * 1000;
+      } else {
+        step.dataSource = _timeout.dataSource;
+        step.dataKey = _timeout.dataKey;
+        timeout = toVariableName(_timeout.dataKey);
+      }
+      // step.timeout = timeout;
+      // step.value = "true";
+      step.parameters = [timeout, condition, step.value];
+      // step.condition = condition;
+      break;
+    }
+
+    case "sleep": {
+      step.type = Types.SLEEP;
+      const duration = parseDataSource(call.arguments[0], stepParams);
+      if (duration.type === "literal") {
+        if (isNaN(duration.value)) {
+          throw new Error(`Sleep duration must be a number, got ${duration.value}`);
+        }
+        step.parameters = [Number(duration.value)];
+      } else {
+        step.dataSource = duration.dataSource;
+        step.dataKey = duration.dataKey;
+        step.parameters = [toVariableName(duration.dataKey)];
+      }
+      break;
+    }
+    case "verify_file_exists": {
+      step.type = Types.VERIFY_FILE_EXISTS;
+      const filePath = parseDataSource(call.arguments[0], stepParams);
+      if (filePath.type === "literal") {
+        step.parameters = [filePath.value];
+      } else {
+        step.dataSource = filePath.dataSource;
+        step.dataKey = filePath.dataKey;
+        step.parameters = [toVariableName(filePath.dataKey)];
+      }
+      break;
+    }
+
+    // case "verifyPagePath":
+    //   {
+    //     step.type = Types.VERIFY_PAGE_PATH;
+    //     step.parameters = [call.arguments[0].value];
+    //     break;
+    //   }
     default:
       return; // Skip if no matching method
   }

package/bin/client/code_gen/duplication_analysis.js

@@ -4,6 +4,7 @@ import path from "path";
 import { CodePage } from "./page_reflection.js";
 import { compareElements, generateSignature } from "./function_signature.js";
 import { updateStepDefinitions } from "../recorderv3/step_utils.js";
+import socketLoggerInstance from "../utils/socket_logger.js";
 /**
  * DuplicationAnalizer class
  * How to use:
@@ -101,7 +102,7 @@ async function compareWithScenario(projectDir, scenario) {
   analyzerExisting.load();
   // generate a temporary folder
   const folder = fs.mkdtempSync(path.join(os.tmpdir(), "blinq-"));
-  await updateStepDefinitions({ scenario, featureName: "temp", projectDir: folder });
+  await updateStepDefinitions({ scenario, featureName: "temp", projectDir: folder, logger: socketLoggerInstance });
   const analyzerScenario = new DuplicationAnalizer(folder);
   analyzerScenario.load();
   const compareResults = [];

package/bin/client/code_gen/function_signature.js

@@ -11,6 +11,8 @@ async function verify_the_opportunity_name_was_created(_name) {
   }
 */
 
+import strip from "strip-comments";
+
 function generateSignature(page, functionName) {
   let functionCode = null;
   let method = null;
@@ -28,6 +30,8 @@ function generateSignature(page, functionName) {
   method.node.body.parent.params.forEach((param) => {
     parameters.push(param.name);
   });
+  const strippedFunctionCode = strip(functionCode);
+  functionCode = strippedFunctionCode !== "" ? strippedFunctionCode : functionCode;
   let lines = functionCode.split("\n");
   // trim all lines
   lines = lines.map((line) => line.trim());

package/bin/client/code_gen/page_reflection.js

@@ -170,7 +170,7 @@ export class CodePage {
                 this.generateModel(fileContentNew);
             }
             catch (e) {
-                logger.info("failed to format the code");
+                logger.error("failed to format the code");
                 logger.debug(e);
             }
             if (!existsSync(this.sourceFileName)) {
@@ -288,6 +288,11 @@ export class CodePage {
             codePart.name = node.id.name;
         }
     }
+    findKey(funcString, key) {
+        const sourceRegex = new RegExp(`${key}:\\s*(.*)`);
+        const match = funcString.match(sourceRegex);
+        return match ? match[1] : null;
+    }
     collectAllTemplates() {
         const templates = [];
         if (this.cucumberCalls.length > 0) {
@@ -300,10 +305,12 @@ export class CodePage {
                 const stepType = cucumberCall["stepType"];
                 let firstFind = true;
                 const stepPaths = [];
+                let source = null;
                 for (let j = 0; j < this.methods.length; j++) {
                     const method = this.methods[j];
                     if (method.name === methodName) {
                         if (firstFind) {
+                            source = this.findKey(method.codePart, "source");
                             foundMethod = true;
                             const paramsObj = (method.node?.params ?? []);
                             if (paramsObj && paramsObj.length > 0) {
@@ -315,7 +322,7 @@ export class CodePage {
                     }
                 }
                 if (foundMethod) {
-                    templates.push({ pattern, methodName, params, stepType, paths: stepPaths });
+                    templates.push({ pattern, methodName, params, stepType, paths: stepPaths, source });
                 }
             }
         }
@@ -363,6 +370,39 @@ export class CodePage {
             return result;
         }
     }
+    addInfraCommandUtil(methodName, description, stepVariables, stepCodeLines, renamedText, previousText, parametersMap, protectStep = false, source = null, codePath = "") {
+        let code = "\n";
+        code += "/**\n";
+        code += ` * ${description}\n`;
+        const tags = [];
+        if (protectStep)
+            tags.push("@protect");
+        if (source)
+            tags.push(`@${source}`);
+        if (tags.length > 0)
+            code += ` * ${tags.join(" ")}\n`;
+        if (codePath !== null)
+            code += ` * @path=${escapeForComment(codePath)}\n`;
+        const matches = previousText.match(/"[^"]*"/g);
+        const countInMethodName = matches ? matches.length : 0;
+        code += " */\n";
+        code += `async function ${methodName} (${new Array(countInMethodName)
+            .fill(0)
+            .map((v, index) => `param${index}`)
+            .join(", ")}){\n`;
+        code += `// source: ${source}\n`;
+        code += `// implemented_at: ${new Date().toISOString()}\n`;
+        stepCodeLines.forEach((line) => (code += `  ${line}\n`));
+        if (renamedText === "verify_page_title" || renamedText === "verify_page_url") {
+            const parameters = stepVariables.map((v) => parametersMap[v.text.replace(/[<>]/g, "")]);
+            code += `await ${renamedText}(${parameters.map((v) => (isNaN(Number(v)) ? `"${v}"` : Number(v))).join(", ")});\n`;
+        }
+        else {
+            code += `await ${renamedText}(${stepVariables.map((v) => (isNaN(Number(v.text)) ? `"${v.text}"` : Number(v.text))).join(", ")});\n`;
+        }
+        code += "}\n";
+        return this._injectMethod(methodName, code);
+    }
     addInfraCommand(methodName, description, stepVarables, stepCodeLines, protectStep = false, source = null, codePath = "") {
         let code = "\n";
         code += "/**\n";
@@ -528,12 +568,13 @@ export class CodePage {
             for (let j = i - 1; j >= 0; j--) {
                 const nextElement = elements[keys[j]];
                 if (this._isSimilarElement(currentElement, nextElement)) {
-                    mergedElements[currentElement.element_key] = currentElement;
-                    replacedKeys[nextElement.element_key] = currentElement.element_key;
+                    // mergedElements[currentElement.element_key!] = currentElement;
+                    // replacedKeys[nextElement.element_key!] = currentElement.element_key!;
                     foundMatch = true;
-                    keys.splice(j, 1);
-                    i--;
-                    j++;
+                    break;
+                    // keys.splice(j, 1);
+                    // i--;
+                    // j++;
                 }
             }
             if (!foundMatch) {
@@ -543,7 +584,7 @@ export class CodePage {
         if (Object.keys(replacedKeys).length === 0)
             return;
         for (const key in replacedKeys) {
-            const regexp = new RegExp(`elements\$begin:math:display$\\\\s*["']${key}["']\\\\s*\\$end:math:display$`, "g");
+            const regexp = new RegExp(`elements\\[\\s*["']${key}["']\\s*\\]`, "g");
             this.fileContent = this.fileContent.replace(regexp, () => `elements["${replacedKeys[key]}"]`);
         }
         this.insertElements(mergedElements);
@@ -620,7 +661,7 @@ export class CodePage {
         let locatorsMetadataFileName = this.sourceFileName.replace(".mjs", ".json");
         const config = getAiConfig();
         if (config && config.locatorsMetadataDir) {
-            locatorsMetadataFileName = path.join(config.locatorsMetadataDir, path.basename(locatorsMetadataFileName));
+            locatorsMetadataFileName = locatorsMetadataFileName.replace(path.join("features", "step_definitions"), path.join(config.locatorsMetadataDir));
             if (!existsSync(path.dirname(locatorsMetadataFileName))) {
                 mkdirSync(path.dirname(locatorsMetadataFileName), { recursive: true });
             }
@@ -632,7 +673,7 @@ export class CodePage {
             }
         }
         catch {
-            logger.info("failed to read locators metadata file", locatorsMetadataFileName);
+            logger.error("failed to read locators metadata file", locatorsMetadataFileName);
         }
         const keys = Object.keys(locatorsMetadata);
         keys.forEach((key) => {
@@ -642,7 +683,7 @@ export class CodePage {
             writeFileSync(locatorsMetadataFileName, JSON.stringify(metadata, null, 2), "utf8");
         }
         catch {
-            logger.info("failed to write locators metadata file", locatorsMetadataFileName);
+            logger.error("failed to write locators metadata file", locatorsMetadataFileName);
         }
     }
     _getVariableStartEnd(variableName) {

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
@@ -67,12 +69,23 @@ 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:
+      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) {
@@ -105,7 +118,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 +185,6 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
   }
 
-  const codeLines = [];
-
   let line = null;
   let comment = null;
   let input = null;
@@ -363,16 +379,33 @@ 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, ${JSON.stringify(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]))}`;
@@ -644,7 +677,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
     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;
       }
@@ -654,7 +687,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
     case Types.CONDITIONAL_WAIT: {
       line = `await context.web.conditionalWait(elements["${elementIdentifier}"], `;
-      input = "_param_0";
+      input = step.valueInStepText ? "_param_0" : `"${escapeNonPrintables(step.parameters[1].replaceAll('"', '\\"'))}"`;
       line += `"${step.parameters[1]}", ${input}, _params, null, this);`;
       codeLines.push(line);
       break;
@@ -684,22 +717,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 +739,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 +756,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 +768,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;
     }
   });
@@ -791,7 +809,7 @@ const generatePageName = (url) => {
     }
     // join by _
     return lowerCaseParts.join("_");
-  } catch (err) {
+  } catch {
     return "default";
   }
 };