Merge branch 'main' into fix/debugger-not-stopping

Author: allansson

package-lock.json

@@ -0,0 +1,22 @@
+// Generated by Grafana k6 Studio (0.0.0-vitest) on 2023-10-01T00:00:00.000Z
+
+import { browser } from "k6/browser";
+
+export const options = {
+  scenarios: {
+    default: {
+      executor: "shared-iterations",
+      options: { browser: { type: "chromium" } },
+    },
+  },
+};
+
+export default async function () {
+  const page = await browser.newPage();
+
+  try {
+    await page.waitForTimeout(1500);
+  } finally {
+    await page?.close();
+  }
+}

src/codegen/browser/__snapshots__/browser/wait-for-timeout-statement.ts

@@ -53,6 +53,7 @@ function isBrowserScenario(scenario: ir.Scenario) {
       case 'WaitForExpression':
       case 'WaitForOptionsExpression':
       case 'WaitForNavigationExpression':
+      case 'WaitForTimeoutExpression':
         return true
 
       case 'Identifier':

src/codegen/browser/code/options.ts

@@ -469,6 +469,19 @@ function emitWaitForNavigationExpression(
     .done()
 }
 
+function emitWaitForTimeoutExpression(
+  context: ScenarioContext,
+  expression: ir.WaitForTimeoutExpression
+): ts.Expression {
+  const target = emitExpression(context, expression.target)
+
+  return new ExpressionBuilder(target)
+    .member('waitForTimeout')
+    .call([literal({ value: expression.timeout })])
+    .await(context)
+    .done()
+}
+
 function emitPromiseAllExpression(
   context: ScenarioContext,
   expression: ir.PromiseAllExpression
@@ -571,6 +584,9 @@ function emitExpression(
     case 'WaitForNavigationExpression':
       return emitWaitForNavigationExpression(context, expression)
 
+    case 'WaitForTimeoutExpression':
+      return emitWaitForTimeoutExpression(context, expression)
+
     case 'PromiseAllExpression':
       return emitPromiseAllExpression(context, expression)
 

src/codegen/browser/code/scenario.ts

@@ -1221,6 +1221,30 @@ it('should emit a waitFor statement', async ({ expect }) => {
   )
 })
 
+it('should emit page.waitForTimeout', async ({ expect }) => {
+  const script = await emitScript({
+    defaultScenario: {
+      nodes: [
+        {
+          type: 'page',
+          nodeId: 'page',
+        },
+        {
+          type: 'wait-for-timeout',
+          nodeId: 'wait-for-timeout',
+          timeout: 1500,
+          inputs: { page: { nodeId: 'page' } },
+        },
+      ],
+    },
+    scenarios: {},
+  })
+
+  await expect(script).toMatchFileSnapshot(
+    '__snapshots__/browser/wait-for-timeout-statement.ts'
+  )
+})
+
 it('should emit merged try-finally blocks', async ({ expect }) => {
   const script = await emitScript({
     defaultScenario: {

src/codegen/browser/codegen.test.ts

@@ -1,12 +1,6 @@
 /* eslint-disable import/default */
 import type { TSESTree as ts } from '@typescript-eslint/types'
-import {
-  AstPath,
-  Plugin,
-  Printer,
-  SupportOption,
-  ParserOptions,
-} from 'prettier'
+import { AstPath, Plugin, SupportOption, ParserOptions } from 'prettier'
 import { builders } from 'prettier/doc'
 import defaultOptions, { options, printers } from 'prettier/plugins/estree'
 import { format as formatWithPrettier } from 'prettier/standalone'
@@ -15,10 +9,6 @@ const { hardline } = builders
 const estree = printers.estree
 
 declare module 'prettier/plugins/estree' {
-  const printers: {
-    estree: Printer<ts.Node>
-  }
-
   const options: Record<string, SupportOption>
 }
 

src/codegen/browser/formatting/formatter.ts

@@ -152,6 +152,12 @@ export interface WaitForNavigationExpression {
   target: Expression
 }
 
+export interface WaitForTimeoutExpression {
+  type: 'WaitForTimeoutExpression'
+  target: Expression
+  timeout: number
+}
+
 export interface PromiseAllExpression {
   type: 'PromiseAllExpression'
   expressions: Expression[]
@@ -237,6 +243,7 @@ export type Expression =
   | WaitForExpression
   | WaitForOptionsExpression
   | WaitForNavigationExpression
+  | WaitForTimeoutExpression
   | PromiseAllExpression
 
 export interface VariableDeclaration {

src/codegen/browser/intermediate/ast.ts

@@ -52,6 +52,7 @@ function buildScenarioGraph(scenario: model.Scenario) {
 
       case 'goto':
       case 'reload':
+      case 'wait-for-timeout':
         graph.connect(node.nodeId, node.inputs.page.nodeId, 'reference')
         connectPrevious(graph, node)
         break

src/codegen/browser/intermediate/context.ts

@@ -427,6 +427,22 @@ function emitWaitForNode(context: IntermediateContext, node: m.WaitForNode) {
   })
 }
 
+function emitWaitForTimeoutNode(
+  context: IntermediateContext,
+  node: m.WaitForTimeoutNode
+) {
+  const page = context.reference(node.inputs.page)
+
+  context.emit({
+    type: 'ExpressionStatement',
+    expression: {
+      type: 'WaitForTimeoutExpression',
+      target: page,
+      timeout: node.timeout,
+    },
+  })
+}
+
 function emitNode(context: IntermediateContext, node: m.TestNode) {
   switch (node.type) {
     case 'page':
@@ -462,6 +478,9 @@ function emitNode(context: IntermediateContext, node: m.TestNode) {
     case 'wait-for':
       return emitWaitForNode(context, node)
 
+    case 'wait-for-timeout':
+      return emitWaitForTimeoutNode(context, node)
+
     default:
       return exhaustive(node)
   }

src/codegen/browser/intermediate/index.ts

@@ -217,6 +217,13 @@ function substituteExpression(
         target: substituteExpression(node.target, substitutions),
       }
 
+    case 'WaitForTimeoutExpression':
+      return {
+        type: 'WaitForTimeoutExpression',
+        target: substituteExpression(node.target, substitutions),
+        timeout: node.timeout,
+      }
+
     default:
       return exhaustive(node)
   }