@dev-blinq/cucumber_client 1.0.1699-dev → 1.0.1701-dev

package/bin/client/recorderv3/step_runner.js

@@ -276,8 +276,8 @@ export class BVTStepRunner {
 
       for (const cmdId of cmdIDs) {
         this.liveExecutionMap.set(cmdId, {
-          resolve: () => { },
-          reject: () => { },
+          resolve: () => {},
+          reject: () => {},
         });
       }
 
@@ -331,7 +331,10 @@ export class BVTStepRunner {
         });
       }
 
-      if ((!(step.isImplemented && !step.shouldOverride) || step.shouldMakeStepTextUnique) && step.commands.length > 0) {
+      if (
+        step.isUtilStep ||
+        ((!(step.isImplemented && !step.shouldOverride) || step.shouldMakeStepTextUnique) && step.commands.length > 0)
+      ) {
         const pageName = generatePageName(step.startFrame?.url ?? "default");
         const stepDefinitionFolderPath = path.join(tempFolderPath, "step_definitions");
         if (!existsSync(stepDefinitionFolderPath)) {

package/bin/client/recorderv3/step_utils.js

@@ -485,7 +485,11 @@ function makeStepTextUnique(step, stepsDefinitions) {
   // console.log("makeStepTextUnique", step.text);
   let stepDef = stepsDefinitions.findMatchingStep(stepText);
   // console.log({ stepDef });
-  if (stepDef && stepDef?.file.endsWith("utils.mjs") && !step.shouldMakeStepTextUnique) {
+  if (
+    stepDef &&
+    (stepDef?.file.endsWith("utils.mjs") || stepDef?.file.endsWith("default_page.mjs")) &&
+    !step.shouldMakeStepTextUnique
+  ) {
     return true;
   }
   while (stepDef) {
@@ -535,27 +539,38 @@ export async function saveRecording({
     return;
   }
 
+  let isUtilStep = false;
+  let isChangedUtilStepName = false;
+
   if (step.isImplemented && step.shouldOverride) {
     const stepDef = stepsDefinitions.findMatchingStep(step.text);
     codePage = getCodePage(stepDef.file);
   } else {
-    const isUtilStep = makeStepTextUnique(step, stepsDefinitions);
+    isUtilStep = makeStepTextUnique(step, stepsDefinitions);
 
     if (isUtilStep) {
-      if (!step.renamedText || step.renamedText === step.text) {
-        return;
-      }
-      step.text = step.text.trim();
-      const { functionName } = stepsDefinitions.findMatchingStep(step.renamedText);
-      step.renamedText = functionName;
-      const newImportLine = `import { ${functionName} } from "./utils.mjs";\n`;
+      isChangedUtilStepName =
+        step.renamedText && stepsDefinitions.findMatchingStep(step.renamedText)?.file.endsWith("default_page.mjs");
+
+      if (!isChangedUtilStepName) {
+        const isUtilStep = stepsDefinitions.findMatchingStep(step.text)?.file.endsWith("utils.mjs");
+        if (!step.renamedText || step.renamedText === step.text || isUtilStep) {
+          return;
+        }
+        step.text = step.text.trim();
+        const { functionName } = stepsDefinitions.findMatchingStep(step.renamedText);
+        step.renamedText = functionName;
+        const newImportLine = `import { ${functionName} } from "./utils.mjs";\n`;
 
-      if (!codePage.fileContent.includes(newImportLine)) {
-        codePage.fileContent = newImportLine + codePage.fileContent;
+        if (!codePage.fileContent.includes(newImportLine)) {
+          codePage.fileContent = newImportLine + codePage.fileContent;
+        }
       }
     }
   }
 
+  const renamedUtil = step.renamedText && isUtilStep;
+
   routesPath = path.join(tmpdir(), "blinq_temp_routes");
   if (process.env.TEMP_RUN === "true") {
     if (existsSync(routesPath)) {
@@ -631,7 +646,7 @@ export async function saveRecording({
       stepsDefinitions
     );
 
-    if (!step.renamedText && !(step.isImplemented && step.shouldOverride)) {
+    if (!renamedUtil && !(step.isImplemented && step.shouldOverride)) {
       stepsDefinitions.addStep({
         name: step.text,
         file: result.codePage.sourceFileName,
@@ -644,13 +659,13 @@ export async function saveRecording({
   } else {
     const generateCodeResult = generateCode(recording, codePage, userData, projectDir, methodName);
     console.log("Generated code for step:", step.text);
-    if (generateCodeResult.noCode === true) {
+    if (!isUtilStep && generateCodeResult.noCode === true) {
       return generateCodeResult.page;
     }
     codePage = generateCodeResult.page;
     methodName = generateCodeResult.methodName;
 
-    if (!step.renamedText) {
+    if (!renamedUtil) {
       codePage.insertElements(generateCodeResult.elements);
     }
 
@@ -666,19 +681,30 @@ export async function saveRecording({
       }
     }
 
-    if (step.renamedText) {
-      codePage.addInfraCommandUtil(
-        methodName,
-        description,
-        cucumberStep.parameters,
-        generateCodeResult.codeLines,
-        step.renamedText,
-        step.text,
-        parametersMap,
-        protect,
-        "recorder",
-        path
-      );
+    if (renamedUtil) {
+      if (isChangedUtilStepName) {
+        const newFileContent = codePage.fileContent
+          .replace(`async function ${step.renamedText}`, `async function ${methodName}`)
+          .replace(`Then("${step.renamedText}"`, `// Then("${step.renamedText}"`)
+          .replace(`When("${step.renamedText}"`, `// When("${step.renamedText}"`)
+          .replace(`Given("${step.renamedText}"`, `// Given("${step.renamedText}"`);
+
+        codePage._init();
+        codePage.generateModel(newFileContent);
+      } else {
+        codePage.addInfraCommandUtil(
+          methodName,
+          description,
+          cucumberStep.parameters,
+          generateCodeResult.codeLines,
+          step.renamedText,
+          step.text,
+          parametersMap,
+          protect,
+          "recorder",
+          path
+        );
+      }
     } else {
       codePage.addInfraCommand(
         methodName,
@@ -700,7 +726,7 @@ export async function saveRecording({
       step.finalTimeout
     );
 
-    if (!step.renamedText && !(step.isImplemented && step.shouldOverride)) {
+    if (!renamedUtil && !(step.isImplemented && step.shouldOverride)) {
       stepsDefinitions.addStep({
         name: step.text,
         file: codePage.sourceFileName,
@@ -762,7 +788,7 @@ export const getCommandsForImplementedStep = (stepName, stepsDefinitions, stepPa
     if (error) {
       throw new Error(error);
     }
-    isUtilStep = codePage.sourceFileName.endsWith("utils.mjs");
+    isUtilStep = codePage.sourceFileName.endsWith("utils.mjs") || codePage.sourceFileName.endsWith("default_page.mjs");
 
     if (parametersNames.length !== stepParams.length) {
       // console.log("Parameters mismatch", parametersNames, stepParams);
@@ -869,7 +895,7 @@ export async function updateStepDefinitions({ scenario, featureName, projectDir,
         step.isImplementedWhileRecording = true;
       }
     }
-    if ((step.isImplemented && !step.shouldOverride) || step.commands.length === 0) {
+    if (!step.isUtilStep && ((step.isImplemented && !step.shouldOverride) || step.commands.length === 0)) {
       let routesPath = path.join(tmpdir(), `blinq_temp_routes`);
       if (process.env.TEMP_RUN === "true") {
         if (existsSync(routesPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1699-dev",
+  "version": "1.0.1701-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",