eslint-plugin-playwright 1.4.2 → 1.5.0

package/dist/index.js

@@ -238,7 +238,7 @@ function parse(context, node) {
     return null;
   }
   let type = group;
-  if ((name === "test" || name === "describe") && (node.arguments.length !== 2 || !isFunction(node.arguments[1]))) {
+  if ((name === "test" || name === "describe") && (node.arguments.length < 2 || !isFunction(node.arguments.at(-1)))) {
     type = "config";
   }
   return {
@@ -1515,9 +1515,7 @@ var no_standalone_expect_default = {
       CallExpression(node) {
         const call = parseFnCall(context, node);
         if (call?.type === "expect") {
-          if (getParent(call.head.node)?.type === "MemberExpression" && call.members.length === 1 && !["assertions", "hasAssertions"].includes(
-            getStringValue(call.members[0])
-          )) {
+          if (getParent(call.head.node)?.type === "MemberExpression" && call.members.length === 1) {
             return;
           }
           const parent = callStack.at(-1);
@@ -1749,14 +1747,44 @@ function replaceAccessorFixer(fixer, node, text) {
     text
   );
 }
+function removePropertyFixer(fixer, property) {
+  const parent = getParent(property);
+  if (parent?.type !== "ObjectExpression")
+    return;
+  if (parent.properties.length === 1) {
+    return fixer.remove(parent);
+  }
+  const index2 = parent.properties.indexOf(property);
+  const range = index2 ? [parent.properties[index2 - 1].range[1], property.range[1]] : [property.range[0], parent.properties[1].range[0]];
+  return fixer.removeRange(range);
+}
 
 // src/rules/no-useless-not.ts
-var matcherMap = {
-  toBeDisabled: "toBeEnabled",
-  toBeEnabled: "toBeDisabled",
-  toBeHidden: "toBeVisible",
-  toBeVisible: "toBeHidden"
+var matcherConfig = {
+  toBeDisabled: { inverse: "toBeEnabled" },
+  toBeEnabled: {
+    argName: "enabled",
+    inverse: "toBeDisabled"
+  },
+  toBeHidden: { inverse: "toBeVisible" },
+  toBeVisible: {
+    argName: "visible",
+    inverse: "toBeHidden"
+  }
 };
+function getOptions(call, name) {
+  const [arg] = call.matcherArgs;
+  if (arg?.type !== "ObjectExpression")
+    return;
+  const property = arg.properties.find(
+    (p) => p.type === "Property" && getStringValue(p.key) === name && isBooleanLiteral(p.value)
+  );
+  return {
+    arg,
+    property,
+    value: property?.value?.value
+  };
+}
 var no_useless_not_default = {
   create(context) {
     return {
@@ -1764,30 +1792,41 @@ var no_useless_not_default = {
         const call = parseFnCall(context, node);
         if (call?.type !== "expect")
           return;
+        const config = matcherConfig[call.matcherName];
+        if (!config)
+          return;
+        const options = config.argName ? getOptions(call, config.argName) : void 0;
+        if (options?.arg && options.value === void 0)
+          return;
         const notModifier = call.modifiers.find(
           (mod) => getStringValue(mod) === "not"
         );
-        if (!notModifier)
+        if (!notModifier && !options?.property)
           return;
-        const matcherName = call.matcherName;
-        if (matcherName in matcherMap) {
-          const newMatcher = matcherMap[matcherName];
-          context.report({
-            data: { new: newMatcher, old: matcherName },
-            fix: (fixer) => [
-              fixer.removeRange([
+        const isInverted = !!notModifier !== (options?.value === false);
+        const newMatcherName = isInverted ? config.inverse : call.matcherName;
+        context.report({
+          data: {
+            new: newMatcherName,
+            old: call.matcherName,
+            property: config.argName ?? ""
+          },
+          fix: (fixer) => {
+            return [
+              // Remove the `not` modifier if it exists
+              notModifier && fixer.removeRange([
                 notModifier.range[0] - getRangeOffset(notModifier),
                 notModifier.range[1] + 1
               ]),
-              replaceAccessorFixer(fixer, call.matcher, newMatcher)
-            ],
-            loc: {
-              end: call.matcher.loc.end,
-              start: notModifier.loc.start
-            },
-            messageId: "noUselessNot"
-          });
-        }
+              // Remove the `visible` or `enabled` property if it exists
+              options?.property && removePropertyFixer(fixer, options.property),
+              // Swap the matcher name if it's different
+              call.matcherName !== newMatcherName && replaceAccessorFixer(fixer, call.matcher, newMatcherName)
+            ].filter(truthy);
+          },
+          loc: notModifier ? { end: call.matcher.loc.end, start: notModifier.loc.start } : options.property.loc,
+          messageId: notModifier ? "noUselessNot" : isInverted ? "noUselessProperty" : "noUselessTruthy"
+        });
       }
     };
   },
@@ -1800,7 +1839,9 @@ var no_useless_not_default = {
     },
     fixable: "code",
     messages: {
-      noUselessNot: "Unexpected usage of not.{{old}}(). Use {{new}}() instead."
+      noUselessNot: "Unexpected usage of not.{{old}}(). Use {{new}}() instead.",
+      noUselessProperty: "Unexpected usage of '{{old}}({ {{property}}: false })'. Use '{{new}}()' instead.",
+      noUselessTruthy: "Unexpected usage of '{{old}}({ {{property}}: true })'. Use '{{new}}()' instead."
     },
     type: "problem"
   }

package/dist/index.mjs

@@ -86,7 +86,7 @@ function parse(context, node) {
     return null;
   }
   let type = group;
-  if ((name === "test" || name === "describe") && (node.arguments.length !== 2 || !isFunction(node.arguments[1]))) {
+  if ((name === "test" || name === "describe") && (node.arguments.length < 2 || !isFunction(node.arguments.at(-1)))) {
     type = "config";
   }
   return {
@@ -1671,9 +1671,7 @@ var init_no_standalone_expect = __esm({
           CallExpression(node) {
             const call = parseFnCall(context, node);
             if (call?.type === "expect") {
-              if (getParent(call.head.node)?.type === "MemberExpression" && call.members.length === 1 && !["assertions", "hasAssertions"].includes(
-                getStringValue(call.members[0])
-              )) {
+              if (getParent(call.head.node)?.type === "MemberExpression" && call.members.length === 1) {
                 return;
               }
               const parent = callStack.at(-1);
@@ -1927,27 +1925,59 @@ function replaceAccessorFixer(fixer, node, text) {
     text
   );
 }
+function removePropertyFixer(fixer, property) {
+  const parent = getParent(property);
+  if (parent?.type !== "ObjectExpression")
+    return;
+  if (parent.properties.length === 1) {
+    return fixer.remove(parent);
+  }
+  const index = parent.properties.indexOf(property);
+  const range = index ? [parent.properties[index - 1].range[1], property.range[1]] : [property.range[0], parent.properties[1].range[0]];
+  return fixer.removeRange(range);
+}
 var getRangeOffset;
 var init_fixer = __esm({
   "src/utils/fixer.ts"() {
     "use strict";
+    init_ast();
     getRangeOffset = (node) => node.type === "Identifier" ? 0 : 1;
   }
 });
 
 // src/rules/no-useless-not.ts
-var matcherMap, no_useless_not_default;
+function getOptions(call, name) {
+  const [arg] = call.matcherArgs;
+  if (arg?.type !== "ObjectExpression")
+    return;
+  const property = arg.properties.find(
+    (p) => p.type === "Property" && getStringValue(p.key) === name && isBooleanLiteral(p.value)
+  );
+  return {
+    arg,
+    property,
+    value: property?.value?.value
+  };
+}
+var matcherConfig, no_useless_not_default;
 var init_no_useless_not = __esm({
   "src/rules/no-useless-not.ts"() {
     "use strict";
     init_ast();
     init_fixer();
+    init_misc();
     init_parseFnCall();
-    matcherMap = {
-      toBeDisabled: "toBeEnabled",
-      toBeEnabled: "toBeDisabled",
-      toBeHidden: "toBeVisible",
-      toBeVisible: "toBeHidden"
+    matcherConfig = {
+      toBeDisabled: { inverse: "toBeEnabled" },
+      toBeEnabled: {
+        argName: "enabled",
+        inverse: "toBeDisabled"
+      },
+      toBeHidden: { inverse: "toBeVisible" },
+      toBeVisible: {
+        argName: "visible",
+        inverse: "toBeHidden"
+      }
     };
     no_useless_not_default = {
       create(context) {
@@ -1956,30 +1986,41 @@ var init_no_useless_not = __esm({
             const call = parseFnCall(context, node);
             if (call?.type !== "expect")
               return;
+            const config = matcherConfig[call.matcherName];
+            if (!config)
+              return;
+            const options = config.argName ? getOptions(call, config.argName) : void 0;
+            if (options?.arg && options.value === void 0)
+              return;
             const notModifier = call.modifiers.find(
               (mod) => getStringValue(mod) === "not"
             );
-            if (!notModifier)
+            if (!notModifier && !options?.property)
               return;
-            const matcherName = call.matcherName;
-            if (matcherName in matcherMap) {
-              const newMatcher = matcherMap[matcherName];
-              context.report({
-                data: { new: newMatcher, old: matcherName },
-                fix: (fixer) => [
-                  fixer.removeRange([
+            const isInverted = !!notModifier !== (options?.value === false);
+            const newMatcherName = isInverted ? config.inverse : call.matcherName;
+            context.report({
+              data: {
+                new: newMatcherName,
+                old: call.matcherName,
+                property: config.argName ?? ""
+              },
+              fix: (fixer) => {
+                return [
+                  // Remove the `not` modifier if it exists
+                  notModifier && fixer.removeRange([
                     notModifier.range[0] - getRangeOffset(notModifier),
                     notModifier.range[1] + 1
                   ]),
-                  replaceAccessorFixer(fixer, call.matcher, newMatcher)
-                ],
-                loc: {
-                  end: call.matcher.loc.end,
-                  start: notModifier.loc.start
-                },
-                messageId: "noUselessNot"
-              });
-            }
+                  // Remove the `visible` or `enabled` property if it exists
+                  options?.property && removePropertyFixer(fixer, options.property),
+                  // Swap the matcher name if it's different
+                  call.matcherName !== newMatcherName && replaceAccessorFixer(fixer, call.matcher, newMatcherName)
+                ].filter(truthy);
+              },
+              loc: notModifier ? { end: call.matcher.loc.end, start: notModifier.loc.start } : options.property.loc,
+              messageId: notModifier ? "noUselessNot" : isInverted ? "noUselessProperty" : "noUselessTruthy"
+            });
           }
         };
       },
@@ -1992,7 +2033,9 @@ var init_no_useless_not = __esm({
         },
         fixable: "code",
         messages: {
-          noUselessNot: "Unexpected usage of not.{{old}}(). Use {{new}}() instead."
+          noUselessNot: "Unexpected usage of not.{{old}}(). Use {{new}}() instead.",
+          noUselessProperty: "Unexpected usage of '{{old}}({ {{property}}: false })'. Use '{{new}}()' instead.",
+          noUselessTruthy: "Unexpected usage of '{{old}}({ {{property}}: true })'. Use '{{new}}()' instead."
         },
         type: "problem"
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-playwright",
   "description": "ESLint plugin for Playwright testing.",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "repository": "https://github.com/playwright-community/eslint-plugin-playwright",
   "author": "Mark Skelton <mark@mskelton.dev>",
   "packageManager": "pnpm@8.12.0",