More tests updated

jsx-eslint · Apr 29, 2024 · 515ba98 · 515ba98
1 parent 7539e1f
commit 515ba98
Show file tree

Hide file tree

Showing 19 changed files with 129 additions and 430 deletions.
diff --git a/lib/rules/no-access-state-in-setstate.js b/lib/rules/no-access-state-in-setstate.js
@@ -62,7 +62,7 @@ module.exports = {
     const vars = [];
     return {
       CallExpression(node) {
-        if (!isClassComponent()) {
+        if (!isClassComponent(node)) {
           return;
         }
         // Appends all the methods that are calling another
@@ -107,7 +107,7 @@ module.exports = {
         if (
           node.property.name === 'state'
           && node.object.type === 'ThisExpression'
-          && isClassComponent()
+          && isClassComponent(node)
         ) {
           let current = node;
           while (current.type !== 'Program') {

diff --git a/lib/rules/no-direct-mutation-state.js b/lib/rules/no-direct-mutation-state.js
@@ -98,7 +98,7 @@ module.exports = {
       },
 
       AssignmentExpression(node) {
-        const component = components.get(utils.getParentComponent());
+        const component = components.get(utils.getParentComponent(node));
         if (shouldIgnoreComponent(component) || !node.left || !node.left.object) {
           return;
         }
@@ -114,7 +114,7 @@ module.exports = {
       },
 
       UpdateExpression(node) {
-        const component = components.get(utils.getParentComponent());
+        const component = components.get(utils.getParentComponent(node));
         if (shouldIgnoreComponent(component) || node.argument.type !== 'MemberExpression') {
           return;
         }

diff --git a/lib/rules/no-set-state.js b/lib/rules/no-set-state.js
@@ -68,7 +68,7 @@ module.exports = {
         ) {
           return;
         }
-        const component = components.get(utils.getParentComponent());
+        const component = components.get(utils.getParentComponent(node));
         const setStateUsages = (component && component.setStateUsages) || [];
         setStateUsages.push(callee);
         components.set(node, {

diff --git a/lib/rules/no-this-in-sfc.js b/lib/rules/no-this-in-sfc.js
@@ -34,7 +34,7 @@ module.exports = {
   create: Components.detect((context, components, utils) => ({
     MemberExpression(node) {
       if (node.object.type === 'ThisExpression') {
-        const component = components.get(utils.getParentStatelessComponent());
+        const component = components.get(utils.getParentStatelessComponent(node));
         if (!component || (component.node && component.node.parent && component.node.parent.type === 'Property')) {
           return;
         }

diff --git a/lib/rules/no-unstable-nested-components.js b/lib/rules/no-unstable-nested-components.js
@@ -306,7 +306,7 @@ module.exports = {
      * @returns {Boolean} True if node is inside class component's render block, false if not
      */
     function isInsideRenderMethod(node) {
-      const parentComponent = utils.getParentComponent();
+      const parentComponent = utils.getParentComponent(node);
 
       if (!parentComponent || parentComponent.type !== 'ClassDeclaration') {
         return false;
@@ -334,8 +334,8 @@ module.exports = {
      * @returns {Boolean} True if given node a function component declared inside class component, false if not
      */
     function isFunctionComponentInsideClassComponent(node) {
-      const parentComponent = utils.getParentComponent();
-      const parentStatelessComponent = utils.getParentStatelessComponent();
+      const parentComponent = utils.getParentComponent(node);
+      const parentStatelessComponent = utils.getParentStatelessComponent(node);
 
       return (
         parentComponent

diff --git a/lib/util/propTypes.js b/lib/util/propTypes.js
@@ -904,7 +904,10 @@ module.exports = function propTypesInstructions(context, components, utils) {
             ignorePropsValidation = true;
             break;
           }
-          const parentProp = context.getSource(propTypes.parent.left.object).replace(/^.*\.propTypes\./, '');
+          const parentProp = eslintUtil
+            .getSourceCode(context)
+            .getText(propTypes.parent.left.object)
+            .replace(/^.*\.propTypes\./, '');
           const types = buildReactDeclarationTypes(
             propTypes.parent.right,
             parentProp

diff --git a/lib/util/usedPropTypes.js b/lib/util/usedPropTypes.js
@@ -512,7 +512,7 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
       // let {firstname} = props
       if (
         isCommonVariableNameForProps(unwrappedInitNode.name)
-        && (utils.getParentStatelessComponent() || isInLifeCycleMethod(node, checkAsyncSafeLifeCycles))
+        && (utils.getParentStatelessComponent(node) || isInLifeCycleMethod(node, checkAsyncSafeLifeCycles))
       ) {
         markPropTypesAsUsed(node.id);
         return;
@@ -546,7 +546,7 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
     'FunctionExpression:exit': popScope,
 
     JSXSpreadAttribute(node) {
-      const component = components.get(utils.getParentComponent());
+      const component = components.get(utils.getParentComponent(node));
       components.set(component ? component.node : node, {
         ignoreUnusedPropTypesValidation: node.argument.type !== 'ObjectExpression',
       });

diff --git a/tests/helpers/parsers-old.js b/tests/helpers/parsers-old.js
diff --git a/tests/lib/rules/destructuring-assignment.js b/tests/lib/rules/destructuring-assignment.js
@@ -376,18 +376,6 @@ ruleTester.run('destructuring-assignment', rule, {
       code: `
         import { useContext } from 'react';
 
-        const MyComponent = (props) => {
-          const {foo} = useContext(aContext);
-          return <div>{foo}</div>
-        };
-      `,
-      options: ['always'],
-      settings: { react: { version: '16.9.0' } },
-    },
-    {
-      code: `
-        import { useContext } from 'react';
-
         const MyComponent = (props) => {
           const foo = useContext(aContext);
           return <div>{foo.test}</div>

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
@@ -371,39 +371,6 @@ ruleTester.run('display-name', rule, {
         };
       `,
     },
-    {
-      code: `
-        import React, {createElement} from "react";
-        const SomeComponent = (props) => {
-          const {foo, bar} = props;
-          return someComponentFactory({
-            onClick: () => foo(bar("x"))
-          });
-        };
-      `,
-    },
-    {
-      code: `
-        import React, {Component} from "react";
-        function someDecorator(ComposedComponent) {
-          return class MyDecorator extends Component {
-            render() {return <ComposedComponent {...this.props} />;}
-          };
-        }
-        module.exports = someDecorator;
-      `,
-    },
-    {
-      code: `
-        import React, {Component} from "react";
-        function someDecorator(ComposedComponent) {
-          return class MyDecorator extends Component {
-            render() {return <ComposedComponent {...this.props} />;}
-          };
-        }
-        module.exports = someDecorator;
-      `,
-    },
     {
       code: `
         const element = (

diff --git a/tests/lib/rules/function-component-definition.js b/tests/lib/rules/function-component-definition.js
@@ -809,11 +809,6 @@ ruleTester.run('function-component-definition', rule, {
           return <div/>;
         }
       `,
-      output: `
-        var Hello: React.FC<Test> = function(props) {
-          return <div/>;
-        }
-      `,
       options: [{ namedComponents: 'function-declaration' }],
       errors: [{ messageId: 'function-declaration' }],
       features: ['types'],
@@ -824,11 +819,6 @@ ruleTester.run('function-component-definition', rule, {
           return <div/>;
         };
       `,
-      output: `
-        var Hello: React.FC<Test> = (props) => {
-          return <div/>;
-        };
-      `,
       options: [{ namedComponents: 'function-declaration' }],
       errors: [{ messageId: 'function-declaration' }],
       features: ['types'],
@@ -854,11 +844,6 @@ ruleTester.run('function-component-definition', rule, {
           return <div/>;
         }
       `,
-      output: `
-        function Hello<Test>(props: Test) {
-          return <div/>;
-        }
-      `,
       options: [{ namedComponents: 'arrow-function' }],
       errors: [{ messageId: 'arrow-function' }],
       features: ['types'],
@@ -965,13 +950,6 @@ ruleTester.run('function-component-definition', rule, {
           }
         }
       `,
-      output: `
-        function wrap(Component) {
-          return function<Test>(props) {
-            return <div><Component {...props}/></div>
-          }
-        }
-      `,
       errors: [{ messageId: 'arrow-function' }],
       options: [{ unnamedComponents: 'arrow-function' }],
       features: ['types'],