eslint-plugin-playwright 2.3.0 → 2.4.0

package/README.md

@@ -38,19 +38,19 @@ file patterns.
 (**eslint.config.js**)
 
 ```javascript
+import { defineConfig } from '@eslint/config'
 import playwright from 'eslint-plugin-playwright'
 
-export default [
+export default defineConfig([
   {
-    ...playwright.configs['flat/recommended'],
     files: ['tests/**'],
+    extends: [playwright.configs['flat/recommended']],
     rules: {
-      ...playwright.configs['flat/recommended'].rules,
       // Customize Playwright rules
       // ...
     },
   },
-]
+])
 ```
 
 [Legacy config](https://eslint.org/docs/latest/use/configure/configuration-files)

package/dist/index.cjs

@@ -435,8 +435,12 @@ var expect_expect_default = createRule({
   create(context) {
     const options = {
       assertFunctionNames: [],
+      assertFunctionPatterns: [],
       ...context.options?.[0] ?? {}
     };
+    const patterns = options.assertFunctionPatterns.map(
+      (pattern) => new RegExp(pattern)
+    );
     const unchecked = [];
     function checkExpressions(nodes) {
       for (const node of nodes) {
@@ -447,12 +451,21 @@ var expect_expect_default = createRule({
         }
       }
     }
+    function matches(node) {
+      if (options.assertFunctionNames.some((name) => dig(node.callee, name))) {
+        return true;
+      }
+      if (patterns.some((pattern) => dig(node.callee, pattern))) {
+        return true;
+      }
+      return false;
+    }
     return {
       CallExpression(node) {
         const call = parseFnCall(context, node);
         if (call?.type === "test") {
           unchecked.push(node);
-        } else if (call?.type === "expect" || options.assertFunctionNames.find((name) => dig(node.callee, name))) {
+        } else if (call?.type === "expect" || matches(node)) {
           const ancestors = context.sourceCode.getAncestors(node);
           checkExpressions(ancestors);
         }
@@ -481,6 +494,10 @@ var expect_expect_default = createRule({
           assertFunctionNames: {
             items: [{ type: "string" }],
             type: "array"
+          },
+          assertFunctionPatterns: {
+            items: [{ type: "string" }],
+            type: "array"
           }
         },
         type: "object"
@@ -693,14 +710,17 @@ var missing_playwright_await_default = createRule({
       // Add any custom matchers to the set
       ...options.customMatchers || []
     ]);
-    function checkValidity(node) {
+    function checkValidity(node, visited) {
       const parent = getParent(node);
       if (!parent)
         return false;
+      if (visited.has(parent))
+        return false;
+      visited.add(parent);
       if (validTypes.has(parent.type))
         return true;
       if (parent.type === "ArrayExpression") {
-        return checkValidity(parent);
+        return checkValidity(parent, visited);
       }
       if (parent.type === "CallExpression" && parent.callee.type === "MemberExpression" && isIdentifier(parent.callee.object, "Promise") && isIdentifier(parent.callee.property, "all")) {
         return true;
@@ -709,9 +729,11 @@ var missing_playwright_await_default = createRule({
         const scope = context.sourceCode.getScope(parent.parent);
         for (const ref of scope.references) {
           const refParent = ref.identifier.parent;
+          if (visited.has(refParent))
+            continue;
           if (validTypes.has(refParent.type))
             return true;
-          if (checkValidity(refParent))
+          if (checkValidity(refParent, visited))
             return true;
         }
       }
@@ -723,7 +745,7 @@ var missing_playwright_await_default = createRule({
         if (call?.type !== "step" && call?.type !== "expect")
           return;
         const result = getCallType(call, awaitableMatchers);
-        const isValid = result ? checkValidity(node) : false;
+        const isValid = result ? checkValidity(node, /* @__PURE__ */ new Set()) : false;
         if (result && !isValid) {
           context.report({
             data: result.data,
@@ -1702,13 +1724,16 @@ var no_standalone_expect_default = createRule({
         if (call?.type === "hook") {
           callStack.push("hook");
         }
+        if (node.callee.type === "MemberExpression" && isPropertyAccessor(node.callee, "extend")) {
+          callStack.push("fixture");
+        }
         if (node.callee.type === "TaggedTemplateExpression") {
           callStack.push("template");
         }
       },
       "CallExpression:exit"(node) {
         const top = callStack.at(-1);
-        if (top === "test" && isTypeOfFnCall(context, node, ["test"]) && node.callee.type !== "MemberExpression" || top === "template" && node.callee.type === "TaggedTemplateExpression") {
+        if (top === "test" && isTypeOfFnCall(context, node, ["test"]) && node.callee.type !== "MemberExpression" || top === "template" && node.callee.type === "TaggedTemplateExpression" || top === "fixture" && node.callee.type === "MemberExpression" && isPropertyAccessor(node.callee, "extend")) {
           callStack.pop();
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-playwright",
   "description": "ESLint plugin for Playwright testing.",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "repository": "https://github.com/playwright-community/eslint-plugin-playwright",
   "author": "Mark Skelton <mark@mskelton.dev>",
   "contributors": [