@dev-blinq/cucumber_client 1.0.1710-dev → 1.0.1712-dev

package/bin/client/code_gen/code_inversion.js

@@ -1,5 +1,9 @@
 import { Types } from "../recording.js";
 import Walker from "node-source-walk";
+/**
+ * @typedef {import("../types/locators").Locator} Locator
+ * @typedef {import("../types/locators").LocatorBundle} LocatorBundle
+ */
 
 const extractElementIdentifier = (node) => {
   // Check for elements["someIdentifier"] pattern
@@ -87,29 +91,33 @@ const parseDataSource = (paramNode, stepParams) => {
   throw new Error("Unknown parameter type");
 };
 
-
 const parseOptions = (optionsNode) => {
   const properties = optionsNode.properties;
-  const options = {}
+  const options = {};
   for (const prop of properties) {
     let key = "";
-    if (prop.key.type === 'Identifier') {
+    if (prop.key.type === "Identifier") {
       key = prop.key.name;
-    } else if (prop.key.type === 'StringLiteral') {
+    } else if (prop.key.type === "StringLiteral") {
       key = prop.key.value;
     }
-    if (key === 'context') continue;
+    if (key === "context") continue;
     options[key] = prop.value.value;
   }
   return options;
-}
+};
 
 const parseOptionsFromCallNode = (call, index) => {
   if (call.arguments[index] && call.arguments[index].type === "ObjectExpression") {
     return parseOptions(call.arguments[index]);
   }
-  return null
-}
+  return null;
+};
+/**
+ * @param {any} call
+ * @param {Record<string, { locators?: Locator[] | LocatorBundle }>} elements
+ * @param {any[]} stepParams
+ */
 const invertStableCommand = (call, elements, stepParams) => {
   const methodName = call.callee.property.name;
   const step = { type: null, parameters: [], element: null, locators: null };
@@ -388,7 +396,7 @@ const invertStableCommand = (call, elements, stepParams) => {
       step.type = Types.CHECK;
       step.element = extractElement(call.arguments[0]);
       step.check = call.arguments[1].value;
-      /// 
+      ///
       step.options = parseOptionsFromCallNode(call, 3);
       break;
 
@@ -596,13 +604,15 @@ const invertStableCommand = (call, elements, stepParams) => {
 
   // Set locators if element exists
   if (step.element && elements[step.element.key]) {
-    step.locators = elements[step.element.key];
+    /** @type {LocatorBundle | Locator[] | undefined} */
+    const locBundle = elements[step.element.key]?.locators;
+    step.locators = locBundle;
   }
 
   if (step.type === Types.CLICK) {
     // handle click with parametric locators
     // check if locators are parametric , i.e. contains `{variable}`
-    if (step.locators && step.locators.locators && Array.isArray(step.locators.locators)) {
+    if (step.locators && !Array.isArray(step.locators) && Array.isArray(step.locators.locators)) {
       let hasParametricLocators = false;
       let variable = "";
       const regex = /{([^}]+)}/g;

package/bin/client/code_gen/function_signature.js

@@ -12,6 +12,10 @@ async function verify_the_opportunity_name_was_created(_name) {
 */
 
 import strip from "strip-comments";
+/**
+ * @typedef {import("../types/locators").Locator} Locator
+ * @typedef {import("../types/locators").LocatorBundle} LocatorBundle
+ */
 
 function generateSignature(page, functionName) {
   let functionCode = null;

package/bin/client/code_gen/index.js

@@ -1,4 +1,8 @@
 import fs from "fs";
+/**
+ * @typedef {import("../types/locators").Locator} Locator
+ * @typedef {import("../types/locators").LocatorBundle} LocatorBundle
+ */
 
 import { Project } from "../project.js";
 import { generateCode } from "./playwright_codeget.js";

package/bin/client/code_gen/page_reflection.js

@@ -567,11 +567,16 @@ export class CodePage {
         if (!element || !element.locators)
             return element;
         const clone = JSON.parse(JSON.stringify(element));
-        for (let i = 0; i < (clone.locators?.length ?? 0); i++) {
-            const locator = clone.locators[i];
-            if (locator.score)
-                delete locator.score;
-        }
+        const locatorsArray = Array.isArray(clone.locators)
+            ? clone.locators
+            : (clone.locators.locators ?? []);
+        for (let i = 0; i < locatorsArray.length; i++) {
+            if (locatorsArray[i].score)
+                delete locatorsArray[i].score;
+        }
+        clone.locators = Array.isArray(clone.locators)
+            ? locatorsArray
+            : { ...clone.locators, locators: locatorsArray };
         return clone;
     }
     insertElements(elements) {

package/bin/client/code_gen/playwright_codeget.js

@@ -114,6 +114,10 @@ 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");
@@ -135,7 +139,7 @@ const splitToLocatorsGroups = (locators) => {
 
 const serializeOptions = (options, context) => {
   if (!options) return "null";
-  if (typeof options !== 'object') return "null";
+  if (typeof options !== "object") return "null";
   if (Array.isArray(options)) return "null";
   let result = "{ ";
   if (context) result += `"context": ${context}, `;
@@ -144,7 +148,7 @@ const serializeOptions = (options, context) => {
   }
   result += " }";
   return result;
-}
+};
 
 const _generateCodeFromCommand = (step, elements, userData) => {
   let elementsChanged = false;
@@ -380,21 +384,21 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       }
       // let options = "null";
       if (step.regex !== "") {
-        options = options ?? {}
+        options = options ?? {};
         options = {
           ...options,
           regex: step.regex,
-          trimSpaces: step.trimSpaces
-        } // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
+          trimSpaces: step.trimSpaces,
+        }; // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
       } else if (step.trimSpaces) {
-        options = options ?? {}
+        options = options ?? {};
         options = {
           ...options,
-          trimSpaces: step.trimSpaces
-        }
+          trimSpaces: step.trimSpaces,
+        };
         // options = `{trimSpaces: ${step.trimSpaces}}`;
       } else {
-        options = null//"null";
+        options = null; //"null";
       }
       line = `await context.web.extractAttribute(elements["${elementIdentifier}"], "${attribute}", ${input}, _params, ${serializeOptions(options)}, this);`;
 
@@ -413,21 +417,21 @@ const _generateCodeFromCommand = (step, elements, userData) => {
         input = "_" + step.dataKey;
       }
       if (step.regex !== "") {
-        options = options ?? {}
+        options = options ?? {};
         options = {
           ...options,
           regex: step.regex,
-          trimSpaces: step.trimSpaces
-        } // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
+          trimSpaces: step.trimSpaces,
+        }; // `{regex: ${JSON.stringify(step.regex)},trimSpaces: ${step.trimSpaces}}`;
       } else if (step.trimSpaces) {
-        options = options ?? {}
+        options = options ?? {};
         options = {
           ...options,
-          trimSpaces: step.trimSpaces
-        }
+          trimSpaces: step.trimSpaces,
+        };
         // options = `{trimSpaces: ${step.trimSpaces}}`;
       } else {
-        options = null//"null";
+        options = null; //"null";
       }
       line = `await context.web.extractProperty(elements["${elementIdentifier}"], "${property}", ${input}, _params, ${serializeOptions(options)}, this);`;
 
@@ -777,7 +781,6 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       break;
     }
 
-
     case Types.CLICK_SIMPLE:
     case Types.FILL_SIMPLE:
       // no code need to be added