@dev-blinq/cucumber_client 1.0.1178-dev → 1.0.1180-dev

package/bin/assets/preload/recorderv3.js

@@ -304,13 +304,16 @@ function findMatchingElements(inputSnapshot, objectSet) {
 
   // For each subtree, check for matches in the object set
   subtrees.forEach((subtree) => {
-    const subtreeText = subtree.join("\n");
+    const subtreeText = subtree.map((t) => t.trim()).join("\n");
 
     // Look for matching snapshots in the object set
     for (const obj of objectSet) {
       // Normalize snapshots for comparison (trim whitespace, etc.)
       const normalizedSubtree = subtreeText.trim();
-      const normalizedSnapshot = obj.snapshot.trim();
+      const normalizedSnapshot = obj.snapshot
+        .split("\n")
+        .map((s) => s.trim())
+        .join("\n");
 
       // Check if the current object's snapshot matches our subtree
       if (normalizedSnapshot === normalizedSubtree) {

package/bin/client/code_gen/code_inversion.js

@@ -387,7 +387,10 @@ const invertStableCommand = (call, elements, stepParams) => {
 
     case "snapshotValidation": {
       step.type = Types.VERIFY_PAGE_SNAPSHOT;
-      step.parameters = extractElement(call.arguments[1]);
+      const inputParam = parseDataSource(call.arguments[1], stepParams);
+      if (inputParam.type === "literal") {
+        step.parameters = [inputParam.value];
+      }
       step.nestFrmLoc = call.arguments[0].value;
       break;
     }
@@ -429,10 +432,70 @@ const invertStableCommand = (call, elements, stepParams) => {
   return step;
 };
 
-// const invertApiCommand = (call) => {
+/* Inspired from  https://github.com/hypervillain/ast-to-literal */
+// This function is not used in the current code, but it is a utility function to convert AST nodes to JSON.
+const interestedLiterals = ["BooleanLiteral", "StringLiteral", "NumericLiteral"];
+
+const toJSON = (node) => {
+  if (interestedLiterals.includes(node.type)) {
+    return node.value;
+  }
+
+  if (node.name === "undefined" && !node.value) {
+    return undefined;
+  }
+
+  if (node.type === "NullLiteral") {
+    return null;
+  }
+
+  if (node.type === "ObjectExpression") {
+    return computeProps(node.properties);
+  }
+
+  if (node.type === "ArrayExpression") {
+    return node.elements.reduce(
+      (acc, element) => [...acc, ...(element.type === "SpreadElement" ? toJSON(element.argument) : [toJSON(element)])],
+      []
+    );
+  }
+};
+
+const computeProps = (props) => {
+  return props.reduce((acc, prop) => {
+    if (prop.type === "SpreadElement") {
+      return {
+        ...acc,
+        ...toJSON(prop.argument),
+      };
+    } else if (prop.type === "ObjectMethod") {
+      const val = toJSON(prop.value);
+      if (val !== undefined) {
+        return {
+          ...acc,
+          [prop.key.name]: val,
+        };
+      }
+    }
+    return acc;
+  }, {});
+};
 
-// }
-const invertCodeToCommand = (codeString, elements = {}, stepParams) => {
+const invertApiCommand = (stepsDefinitions, codePage, stepName) => {
+  let apiData = null;
+  const step = { type: Types.API, value: null };
+  const apiStep = stepsDefinitions.findMatchingStep(stepName);
+  for (const method of codePage.methods) {
+    if (method.getMethodType() === "api" && method.name == apiStep.functionName) {
+      apiData = method.getVariableDeclerationObject("apiData");
+      break;
+    }
+  }
+  step.value = apiData;
+  return step;
+  // const apiData = toJSON(call.arguments[0]);
+};
+const invertCodeToCommand = (codeString, elements = {}, stepParams, stepsDefinitions, codePage, stepName) => {
   const walker = new Walker();
   const steps = [];
 
@@ -455,13 +518,12 @@ const invertCodeToCommand = (codeString, elements = {}, stepParams) => {
 
     const propName = call.callee.object.property.name;
 
-    // if (propName === 'api') {
-    //     const step = invertApiCommand(call);
-    //     if (step) steps.push(step);
-    // } else
     if (propName === "web" || propName === "stable") {
       const step = invertStableCommand(call, elements, stepParams);
       if (step) steps.push(step);
+      // } else if (propName === "api") {
+      //   const step = invertApiCommand(stepsDefinitions, codePage, stepName);
+      //   if (step) steps.push(step);
     } else {
       return;
     }

package/bin/client/code_gen/playwright_codeget.js

@@ -1,11 +1,9 @@
 import { Types } from "../recording.js";
-
 import logger from "../../logger.js";
 import { StepsDefinitions } from "../cucumber/steps_definitions.js";
 import path from "path";
 import { CodePage } from "./page_reflection.js";
 import { convertToIdentifier, escapeNonPrintables } from "./utils.js";
-import { all } from "axios";
 const findElementIdentifier = (node, step, userData, elements) => {
   if (node.key) {
     // incase of rerunning implemented steps
@@ -290,12 +288,12 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
     case Types.VERIFY_PAGE_SNAPSHOT:
       comment = step.nestFrmLoc
-        ? `// Verify page snapshot ${step.parameters[0]} in the frame`
+        ? `// Verify page snapshot ${step.parameters[0]} in the frame ${step.nestFrmLoc}`
         : `// Verify page snapshot ${step.parameters[0]}`;
       codeLines.push(escapeNonPrintables(comment));
       line = `const frameLocator = ${JSON.stringify(step.nestFrmLoc ?? null)}`;
       codeLines.push(line);
-      line = `await context.web.snapshotValidation(frameLocator,${JSON.stringify(step.parameters[0])}, _params, ${JSON.stringify(options)}, this);`;
+      line = `await context.web.snapshotValidation(frameLocator, _param_0 , _params, ${JSON.stringify(options)}, this);`;
       codeLines.push(line);
       break;
     case Types.VERIFY_PAGE_CONTAINS_TEXT:

package/bin/client/cucumber/steps_definitions.js

@@ -224,6 +224,16 @@ class StepsDefinitions {
           }
         }
       }
+    } else if (codeObj.type === "VariableDeclaration") {
+      if (codeObj.code.includes("context.api.")) {
+        codeObj.local_type = "context_api";
+        // set api_type to request, etc
+        let startIndex = codeObj.code.indexOf("context.api.") + "context.api.".length;
+        let endIndex = codeObj.code.indexOf("(", startIndex);
+        if (endIndex >= 0) {
+          codeObj.api_type = codeObj.code.substring(startIndex, endIndex);
+        }
+      }
     }
   }
   analyzeStepDefinitionwithStep(step) {

package/bin/client/recorderv3/bvt_recorder.js

@@ -495,6 +495,16 @@ export class BVTRecorder {
       this.sendEvent(this.events.onGoto, { url: transition.userTypedURL });
     }
   }
+
+  async getCurrentPageTitle() {
+    const title = await this.page.title();
+    return title;
+  }
+  async getCurrentPageUrl() {
+    const url = await this.page.url();
+    return url;
+  }
+
   _addPagelisteners(context) {
     context.on("page", async (page) => {
       try {

package/bin/client/recorderv3/index.js

@@ -216,6 +216,12 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
         return { folder: snapshotFolder, files: ymlFiles };
       } else return { folder: null, files: [] };
     },
+    "recorderWindow.getCurrentPageTitle": async (input) => {
+      return await recorder.getCurrentPageTitle();
+    },
+    "recorderWindow.getCurrentPageUrl": async (input) => {
+      return await recorder.getCurrentPageUrl();
+    },
     "recorderWindow.sendAriaSnapshot": async (input) => {
       const snapshot = input?.snapshot;
       const deselect = input?.deselect;

package/bin/client/recorderv3/update_feature.js

@@ -96,7 +96,7 @@ export function getCommandContent(command) {
       return `send a ${command.value.method} API request to ${command.value.url}`;
     }
     case "verify_page_snapshot": {
-      return `verify page snapshot stored in ${command.value}`;
+      return `verify page snapshot stored in ${command.parameters[0]}`;
     }
     default: {
       return "";

package/package.json

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