@rettangoli/vt 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rettangoli/vt",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Rettangoli Visual Testing",
   "type": "module",
   "main": "./src/index.js",

package/src/createSteps.js

@@ -1,5 +1,11 @@
-async function click(page, args) {
-  await page.mouse.click(Number(args[0]), Number(args[1]), { button: "left" });
+async function click(page, args, context, selectedElement) {
+  if (selectedElement) {
+    await selectedElement.click();
+  } else if (args.length >= 2) {
+    await page.mouse.click(Number(args[0]), Number(args[1]), { button: "left" });
+  } else {
+    console.warn('`click` command needs a `select` block or coordinates.');
+  }
 }
 
 async function customEvent(page, args) {
@@ -30,28 +36,68 @@ async function mouseUp(page) {
   await page.mouse.up();
 }
 
+async function rMouseDown(page){
+  await page.mouse.down({ button: 'right' });
+}
+
+async function rMouseUp(page){
+  await page.mouse.up({ button: 'right' });
+}
+
 async function move(page, args) {
   await page.mouse.move(Number(args[0]), Number(args[1]));
 }
 
-async function rclick(page, args) {
-  await page.mouse.click(Number(args[0]), Number(args[1]), { button: "right" });
+async function rclick(page, args, context, selectedElement) {
+  if (selectedElement) {
+    await selectedElement.click({ button: 'right' });
+  } else if (args.length >= 2) {
+    await page.mouse.click(Number(args[0]), Number(args[1]), { button: "right" });
+  } else {
+    console.warn('`rclick` command needs a `select` block or coordinates.');
+  }
 }
 
 async function wait(page, args) {
   await page.waitForTimeout(Number(args[0]));
 }
 
+async function write(page, args, context, selectedElement) {
+  if (selectedElement) {
+    const textToWrite = args.join(' ');
+    await selectedElement.fill(textToWrite);
+  } else {
+    console.warn('`write` command called without a `select` block.');
+  }
+}
+
+async function select(page, args) {
+  const testId = args[0];
+  const hostElementLocator = page.getByTestId(testId);
+  
+  const interactiveElementLocator = hostElementLocator.locator(
+    'input, textarea, button, select, a'
+  ).first();
+  
+  const count = await interactiveElementLocator.count();
+  
+  if (count > 0) {
+    return interactiveElementLocator;
+  }
+  
+  return hostElementLocator;
+}
+
 export function createSteps(page, context) {
   let screenshotIndex = 0;
 
-  async function screenshot(page) {
+  async function screenshot() {
     screenshotIndex++;
     const screenshotPath = await context.takeAndSaveScreenshot(page, `${context.baseName}-${screenshotIndex}`);
     console.log(`Screenshot saved: ${screenshotPath}`);
   }
 
-  const stepHandlers = {
+  const actionHandlers = {
     click,
     customEvent,
     goto,
@@ -60,19 +106,42 @@ export function createSteps(page, context) {
     mouseUp,
     move,
     rclick,
+    rMouseDown,
+    rMouseUp,
     screenshot,
+    select,
     wait,
+    write,
   };
 
+  async function executeSingleStep(stepString, selectedElement) {
+    const [command, ...args] = stepString.split(" ");
+    const actionFn = actionHandlers[command];
+    if (actionFn) {
+      await actionFn(page, args, context, selectedElement);
+    } else {
+      console.warn(`Unknown step command: "${command}"`);
+    }
+  }
+
   return {
-    async executeStep(stepString) {
-      const [command, ...args] = stepString.split(" ");
-      
-      const stepFn = stepHandlers[command];
-      if (stepFn) {
-        await stepFn(page, args, context);
-      } else {
-        console.warn(`Unknown step command: "${command}"`);
+    async executeStep(step) {
+      if (typeof step === 'string') {
+        await executeSingleStep(step, null);
+      } else if (typeof step === 'object' && step !== null) {
+        const blockCommandString = Object.keys(step)[0];
+        const nestedStepStrings = step[blockCommandString];
+        const [command, ...args] = blockCommandString.split(" ");
+
+        const blockFn = actionHandlers[command];
+        if (blockFn) {
+          const selectedElement = await blockFn(page, args, context, null);
+          for (const nestedStep of nestedStepStrings) {
+            await executeSingleStep(nestedStep, selectedElement);
+          }
+        } else {
+          console.warn(`Unsupported block command: "${command}".`);
+        }
       }
     }
   };