eslint-plugin-power-esrules 0.1.13 → 0.1.15

package/lib/rules/import-sorting.js

@@ -22,25 +22,6 @@ function getImportType(node) {
   if (source.startsWith("./") || source.startsWith("../")) {
     return "relative";
   }
-  // Старое поведение (оставлено для истории):
-  // Относительные импорты (./ или ../) всегда внутренние
-  // if (source.startsWith("./") || source.startsWith("../")) {
-  //   // Проверяем, является ли это компонентом
-  //   // Компоненты обычно импортируются как default или с большой буквы
-  //   const isDefaultImport = node.specifiers.some(
-  //     (spec) => spec.type === "ImportDefaultSpecifier"
-  //   );
-  //   const hasComponentName = node.specifiers.some(
-  //     (spec) =>
-  //       spec.type === "ImportSpecifier" &&
-  //       spec.imported &&
-  //       /^[A-Z]/.test(spec.imported.name)
-  //   );
-  //   if (isDefaultImport || hasComponentName) {
-  //     return "component";
-  //   }
-  //   return "internal";
-  // }
 
   // Сторонние библиотеки (не относительные и не начинаются с внутренних путей)
   const internalPathPatterns = [
@@ -82,6 +63,7 @@ function getImportType(node) {
     if (isUtility) {
       return "internal";
     }
+
     // Проверяем, является ли это компонентом
     const isDefaultImport = node.specifiers.some(
       (spec) => spec.type === "ImportDefaultSpecifier",
@@ -91,8 +73,7 @@ function getImportType(node) {
         spec.type === "ImportSpecifier" &&
         spec.imported &&
         /^[A-Z][a-zA-Z]*$/.test(spec.imported.name) && // Имя начинается с большой буквы и не все заглавные
-        spec.imported.name !== spec.imported.name.toUpperCase() && // Не константа (не все заглавные)
-        !spec.imported.name.endsWith("Context"), // не содержит ключевого слова Context
+        spec.imported.name !== spec.imported.name.toUpperCase(), // Не константа (не все заглавные)
     );
     if (isDefaultImport || hasComponentName) {
       return "component";
@@ -104,7 +85,8 @@ function getImportType(node) {
       spec.type === "ImportSpecifier" &&
       spec.imported &&
       /^[A-Z][a-zA-Z]*$/.test(spec.imported.name) &&
-      spec.imported.name !== spec.imported.name.toUpperCase(), // Не константа
+      spec.imported.name !== spec.imported.name.toUpperCase() && // Не константа
+      !spec.imported.name.endsWith("Context"),
   );
   if (hasComponentName) {
     return "component";

package/lib/rules/require-data-testid.js

@@ -34,6 +34,17 @@ function isPascalCase(name) {
 function getComponentName(node) {
   if (!node) return null;
 
+  if (node.type === "ClassDeclaration") {
+    return node.id?.name ?? null;
+  }
+
+  if (
+    node.type === "ClassExpression" &&
+    node.parent?.type === "VariableDeclarator"
+  ) {
+    return node.parent.id?.name ?? null;
+  }
+
   // Функция объявлена напрямую
   if (node.type === "FunctionDeclaration") {
     return node.id?.name ?? null;
@@ -48,6 +59,20 @@ function getComponentName(node) {
     return node.parent.id?.name ?? null;
   }
 
+  if (
+    node.parent?.type === "CallExpression" &&
+    node.parent.parent?.type === "VariableDeclarator"
+  ) {
+    node.parent.parent.id?.name ?? null;
+  }
+
+  if (
+    node.type === "CallExpression" &&
+    node.parent?.type === "VariableDeclarator"
+  ) {
+    return node.parent.id?.name ?? null;
+  }
+
   // HOC обёртка: memo(() => {}) или forwardRef(() => {}) или observer(() => {})
   if (node.type === "CallExpression" && node.arguments.length > 0) {
     return getComponentName(node.arguments[0]);
@@ -66,6 +91,28 @@ function isReactComponent(node) {
 function getRootJSXFromComponent(fnNode) {
   if (!fnNode) return null;
 
+  if (fnNode.type === "ClassDeclaration" || fnNode.type === "ClassExpression") {
+    const renderMethod = fnNode.body.body.find(
+      (member) =>
+        member.type === "MethodDefinition" && member.key?.name === "render",
+    );
+
+    if (!renderMethod) return null;
+
+    const body = renderMethod.value.body.body;
+
+    for (const stmt of body) {
+      if (
+        stmt.type === "ReturnStatement" &&
+        stmt.argument &&
+        (stmt.argument.type === "JSXElement" ||
+          stmt.argument.type === "JSXFragment")
+      ) {
+        return stmt.argument;
+      }
+    }
+  }
+
   // Разворачиваем HOC
   if (fnNode.type === "CallExpression" && fnNode.arguments.length > 0) {
     return getRootJSXFromComponent(fnNode.arguments[0]);
@@ -177,8 +224,9 @@ module.exports = {
       FunctionDeclaration: collectComponent,
       FunctionExpression: collectComponent,
       ArrowFunctionExpression: collectComponent,
-      // CallExpression больше не нужен, HOC разворачиваются внутри getComponentName
-      //"CallExpression": collectComponent,
+      ClassDeclaration: collectComponent,
+      ClassExpression: collectComponent,
+      CallExpression: collectComponent,
 
       "Program:exit"() {
         for (const component of components) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-power-esrules",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "custom ESLint rules",
   "main": "index.js",
   "peerDependencies": {

package/tests/import-sorting.test.js

@@ -0,0 +1,158 @@
+const { RuleTester } = require("eslint");
+const rule = require("../lib/rules/import-sorting");
+
+const ruleTester = new RuleTester({
+  parserOptions: {
+    ecmaVersion: 2022,
+    sourceType: "module",
+    ecmaFeatures: { jsx: true },
+  },
+});
+
+ruleTester.run("import-sorting", rule, {
+  valid: [
+    {
+      name: "correctly sorted imports with blank lines",
+      code: `
+        import React from 'react';
+        import _ from 'lodash';
+
+        import { fetchData } from 'api';
+        import { calculate } from 'utils';
+
+        import Button from 'components/Button';
+        import Header from 'components/Header';
+
+        import helper from './helper';
+      `,
+    },
+    {
+      name: "single external import",
+      code: `
+        import React from 'react';
+      `,
+    },
+    {
+      name: "external and internal imports only",
+      code: `
+        import React from 'react';
+
+        import { fetchData } from 'api';
+      `,
+    },
+    {
+      name: "component import after internal",
+      code: `
+        import React from 'react';
+
+        import { fetchData } from 'api';
+
+        import Button from 'components/Button';
+      `,
+    },
+    {
+      name: "relative imports last",
+      code: `
+        import React from 'react';
+
+        import { fetchData } from 'api';
+
+        import Button from 'components/Button';
+
+        import util from '../util';
+        import helper from './helper';
+      `,
+    },
+    {
+      name: "React context import is inner import",
+      code: `
+        import { fetchData } from 'api';
+        import {PageContext} from 'pages/page';
+        
+        import ComponentA from 'components/ComponentA';
+        
+      `,
+    },
+  ],
+
+  invalid: [
+    {
+      name: "external import after internal",
+      code: `
+        import { fetchData } from 'api';
+        import React from 'react';
+      `,
+      output: `
+        import React from 'react';
+
+        import { fetchData } from 'api';
+      `,
+      errors: [{ messageId: "incorrectOrder" }],
+    },
+    {
+      name: "component import before internal",
+      code: `
+        import Button from 'components/Button';
+        import { fetchData } from 'api';
+      `,
+      output: `
+        import { fetchData } from 'api';
+
+        import Button from 'components/Button';
+      `,
+      errors: [{ messageId: "incorrectOrder" }],
+    },
+    {
+      name: "missing blank line between groups",
+      code: `
+        import React from 'react';
+        import _ from 'lodash';
+        import { fetchData } from 'api';
+      `,
+      output: `
+        import React from 'react';
+        import _ from 'lodash';
+
+        import { fetchData } from 'api';
+      `,
+      errors: [{ messageId: "missingBlankLine" }],
+    },
+    {
+      name: "relative import not last",
+      code: `
+        import helper from './helper';
+        import { fetchData } from 'api';
+      `,
+      output: `
+        import { fetchData } from 'api';
+
+        import helper from './helper';
+      `,
+      errors: [{ messageId: "incorrectOrder" }],
+    },
+    {
+      name: "multiple issues at once",
+      code: `
+        import Button from 'components/Button';
+        import React from 'react';
+        import { fetchData } from 'api';
+        import helper from './helper';
+      `,
+      output: `
+        import React from 'react';
+
+        import { fetchData } from 'api';
+
+        import Button from 'components/Button';
+
+        import helper from './helper';
+      `,
+      errors: [
+        { messageId: "incorrectOrder" },
+        { messageId: "missingBlankLine" },
+      ],
+    },
+  ],
+});
+
+console.log("OK");

package/tests/require-data-testid.test.js

@@ -19,6 +19,16 @@ ruleTester.run("require-data-testid", rule, {
         }
       `,
     },
+    {
+      name: "class component with data-testid",
+      code: `
+      class MyComponent extends PureComponent {
+        render() {
+          return <div data-testid="my-component">Hello</div>;
+        }
+      }
+      `,
+    },
     {
       name: "arrow component with dataTestID",
       code: `
@@ -67,6 +77,17 @@ ruleTester.run("require-data-testid", rule, {
       `,
       errors: [{ messageId: "missingDataTestId" }],
     },
+    {
+      name: "class component without data-testid",
+      code: `
+      class MyComponent extends PureComponent {
+        render() {
+          return <div>Hello</div>;
+        }
+      }
+      `,
+      errors: [{ messageId: "missingDataTestId" }],
+    },
     {
       name: "arrow component missing data-testid",
       code: `