@dev-blinq/cucumber_client 1.0.1324-dev → 1.0.1326-dev

package/bin/client/recorderv3/bvt_recorder.js

@@ -1,9 +1,9 @@
 // define the jsdoc type for the input
 import { closeContext, initContext, _getDataFile, resetTestData } from "automation_model";
-import { existsSync, mkdir, mkdirSync, readdirSync, readFileSync, rmSync } from "fs";
+import { existsSync, readdirSync, readFileSync, rmSync } from "fs";
 import path from "path";
 import url from "url";
-import { getImplementedSteps, getStepsAndCommandsForScenario } from "./implemented_steps.js";
+import { getImplementedSteps, parseRouteFiles } from "./implemented_steps.js";
 import { NamesService } from "./services.js";
 import { BVTStepRunner } from "./step_runner.js";
 import { readFile, writeFile } from "fs/promises";
@@ -201,6 +201,10 @@ export class BVTRecorder {
               console.log("Sending cmdExecutionFailure event for cmdId:", data);
               this.sendEvent(this.events.cmdExecutionFailure, data);
               break;
+            case "interceptResults":
+              console.log("Sending interceptResults event");
+              this.sendEvent(this.events.interceptResults, data);
+              break;
             default:
               console.warn("Unknown command execution status type:", data.type);
               break;
@@ -211,7 +215,7 @@ export class BVTRecorder {
     this.pageSet = new Set();
     this.lastKnownUrlPath = "";
     // TODO: what is world?
-    this.world = { attach: () => { } };
+    this.world = { attach: () => {} };
     this.shouldTakeScreenshot = true;
     this.watcher = null;
   }
@@ -227,6 +231,7 @@ export class BVTRecorder {
     cmdExecutionStart: "BVTRecorder.cmdExecutionStart",
     cmdExecutionSuccess: "BVTRecorder.cmdExecutionSuccess",
     cmdExecutionFailure: "BVTRecorder.cmdExecutionFailure",
+    interceptResults: "BVTRecorder.interceptResults",
   };
   bindings = {
     __bvt_recordCommand: async ({ frame, page, context }, event) => {
@@ -319,7 +324,7 @@ export class BVTRecorder {
     process.env.CDP_LISTEN_PORT = this.#remoteDebuggerPort;
 
     this.stepRunner.setRemoteDebugPort(this.#remoteDebuggerPort);
-    this.world = { attach: () => { } };
+    this.world = { attach: () => {} };
 
     const ai_config_file = path.join(this.projectDir, "ai_config.json");
     let ai_config = {};
@@ -707,7 +712,7 @@ export class BVTRecorder {
     if (this.shouldTakeScreenshot) {
       await this.storeScreenshot(event);
     }
-    
+
     this.sendEvent(this.events.onNewCommand, cmdEvent);
     this._updateUrlPath();
   }
@@ -725,7 +730,7 @@ export class BVTRecorder {
   }
   async closeBrowser() {
     delete process.env.TEMP_RUN;
-    await this.watcher.close().then(() => { });
+    await this.watcher.close().then(() => {});
     this.watcher = null;
     this.previousIndex = null;
     this.previousHistoryLength = null;
@@ -826,6 +831,7 @@ export class BVTRecorder {
     };
 
     this.bvtContext.navigate = true;
+    this.bvtContext.loadedRoutes = null;
     for (const [key, value] of Object.entries(_env)) {
       process.env[key] = value;
     }
@@ -1017,52 +1023,6 @@ export class BVTRecorder {
     return getCommandsForImplementedStep(stepName, step_definitions, stepParams).commands;
   }
 
-  parseRouteFiles(step) {
-    const routeFolder = path.join(this.projectDir, "data", "routes");
-    const templateRouteMap = new Map();
-
-    // Go over all the files in the route folder and parse them
-    const routeFiles = readdirSync(routeFolder).filter((file) => file.endsWith(".json"));
-    for (const file of routeFiles) {
-      const filePath = path.join(routeFolder, file);
-      const routeData = JSON.parse(readFileSync(filePath, "utf8"));
-      if (routeData && routeData.template) {
-        const template = routeData.template;
-        const routes = routeData.routes;
-
-        templateRouteMap.set(template, routes);
-      }
-    }
-
-    if (!existsSync(routeFolder)) {
-      return null;
-    } else if (step && step.text) {
-      // Convert the step text to cucumber template
-      const cucumberStep = new Step();
-      cucumberStep.text = step.text;
-      const template = cucumberStep.getTemplate();
-      if (templateRouteMap.has(template)) {
-        const routeItems = templateRouteMap.get(template);
-        console.log("Route Items from template:", routeItems);
-        routeItems.forEach((item) => {
-          const filters = item.filters || {};
-          const queryParams = filters?.queryParams || {};
-          console.log("Query Params:", queryParams);
-          const queryParamsArray = Object.keys(queryParams).map((key) => ({
-            paramKey: key,
-            paramValue: queryParams[key],
-          }));
-          console.log("Query Params Array:", queryParamsArray);
-          filters.queryParams = queryParamsArray || [];
-        });
-        step.routeItems = routeItems;
-        console.log("Route Items:", step.routeItems);
-      } else {
-        step.routeItems = null;
-      }
-    }
-  }
-
   loadExistingScenario({ featureName, scenarioName }) {
     const step_definitions = loadStepDefinitions(this.projectDir);
     const featureFilePath = path.join(this.projectDir, "features", featureName);
@@ -1091,7 +1051,7 @@ export class BVTRecorder {
         ..._s,
         keyword: step.keyword.trim(),
       };
-      this.parseRouteFiles(_step);
+      parseRouteFiles(this.projectDir, _step);
       steps.push(_step);
     }
     return {

package/bin/client/recorderv3/implemented_steps.js

@@ -1,9 +1,9 @@
 import { AstBuilder, GherkinClassicTokenMatcher, Parser } from "@cucumber/gherkin";
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync } from "fs";
 import path from "path";
 import url from "url";
 import { findFilesWithExtension, StepsDefinitions } from "../cucumber/steps_definitions.js";
-import { Feature } from "../cucumber/feature.js";
+import { Feature, Step } from "../cucumber/feature.js";
 import { CodePage } from "../code_gen/page_reflection.js";
 import { getCommandsForImplementedStep, loadStepDefinitions } from "./step_utils.js";
 import { parseStepTextParameters } from "../cucumber/utils.js";
@@ -57,6 +57,48 @@ function memorySizeOf(obj) {
   return sizeOf(obj);
 }
 
+export function parseRouteFiles(projectDir, step) {
+  const routeFolder = path.join(projectDir, "data", "routes");
+  const templateRouteMap = new Map();
+
+  // Go over all the files in the route folder and parse them
+  const routeFiles = readdirSync(routeFolder).filter((file) => file.endsWith(".json"));
+  for (const file of routeFiles) {
+    const filePath = path.join(routeFolder, file);
+    const routeData = JSON.parse(readFileSync(filePath, "utf8"));
+    if (routeData && routeData.template) {
+      const template = routeData.template;
+      const routes = routeData.routes;
+
+      templateRouteMap.set(template, routes);
+    }
+  }
+
+  if (!existsSync(routeFolder)) {
+    return null;
+  } else if (step && step.text) {
+    // Convert the step text to cucumber template
+    const cucumberStep = new Step();
+    cucumberStep.text = step.text;
+    const template = cucumberStep.getTemplate();
+    if (templateRouteMap.has(template)) {
+      const routeItems = templateRouteMap.get(template);
+      routeItems.forEach((item) => {
+        const filters = item.filters || {};
+        const queryParams = filters?.queryParams || {};
+        const queryParamsArray = Object.keys(queryParams).map((key) => ({
+          paramKey: key,
+          paramValue: queryParams[key],
+        }));
+        filters.queryParams = queryParamsArray || [];
+      });
+      step.routeItems = routeItems;
+    } else {
+      step.routeItems = null;
+    }
+  }
+}
+
 export const getImplementedSteps = async (projectDir) => {
   const foundErrors = [];
   try {
@@ -168,7 +210,10 @@ export const getImplementedSteps = async (projectDir) => {
       }
       stepLineSet.add(stepLine);
       step.templateIndex = implementedSteps.length;
-      implementedSteps.push({
+
+      parseRouteFiles(projectDir, step);
+
+      const implementedStep = {
         keyword: step.keyword.trim(),
         keywordAlias: step.keywordAlias?.trim(),
         text: updateStepText(template.pattern, step.parameters),
@@ -179,7 +224,10 @@ export const getImplementedSteps = async (projectDir) => {
         templateIndex: step.templateIndex,
         pattern: template.pattern,
         paths: template.paths,
-      });
+        routeItems: step.routeItems,
+      };
+
+      implementedSteps.push(implementedStep);
     }
   }
 

package/bin/client/recorderv3/step_runner.js

@@ -186,6 +186,14 @@ export class BVTStepRunner {
             //     }
             //   }
             // }
+          } else if (attachment.mediaType === "application/json+intercept-results" && attachment.body) {
+            const body = JSON.parse(attachment.body);
+            if (body) {
+              this.sendExecutionStatus({
+                type: "interceptResults",
+                interceptResults: body,
+              });
+            }
           }
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1324-dev",
+  "version": "1.0.1326-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -32,7 +32,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.178-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.779-dev",
+    "automation_model": "1.0.780-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",