feature: eslint-plugin-putout: stylistic/{js,ts,jsx} -> stylistic

Author: coderaiser

packages/eslint-plugin-putout/lib/json.mjs

@@ -1,4 +1,4 @@
-import stylisticJs from '@stylistic/eslint-plugin-js';
+import stylistic from '@stylistic/eslint-plugin';
 import * as putout from './plugin.mjs';
 
 export default [{
@@ -9,31 +9,31 @@ export default [{
     ],
     rules: {
         'no-undef': 'off',
-        '@stylistic/js/quotes': [
+        '@stylistic/quotes': [
             'error',
             'double',
         ],
-        '@stylistic/js/quote-props': [
+        '@stylistic/quote-props': [
             'error',
             'always',
         ],
-        '@stylistic/js/comma-dangle': [
+        '@stylistic/comma-dangle': [
             'error',
             'never',
         ],
-        '@stylistic/js/comma-spacing': 'off',
-        '@stylistic/js/function-paren-newline': 'off',
-        '@stylistic/js/eol-last': [
+        '@stylistic/comma-spacing': 'off',
+        '@stylistic/function-paren-newline': 'off',
+        '@stylistic/eol-last': [
             'error',
             'always',
         ],
-        '@stylistic/js/no-multi-spaces': 'off',
+        '@stylistic/no-multi-spaces': 'off',
     },
 }, {
     name: 'putout: json: package.json',
     files: ['**/package.json'],
     rules: {
-        '@stylistic/js/indent': [
+        '@stylistic/indent': [
             'error',
             2,
         ],
@@ -42,25 +42,25 @@ export default [{
     name: 'putout: json: ignore',
     files: ['**/*ignore{json}'],
     rules: {
-        '@stylistic/js/comma-dangle': 'off',
+        '@stylistic/comma-dangle': 'off',
     },
 }, {
     name: 'putout: json: yaml',
     files: ['**/*.{yml,yaml}{json}'],
     plugins: {
-        '@stylistic': stylisticJs,
+        '@stylistic': stylistic,
         putout,
     },
     rules: {
         'putout/objects-braces-inside-array': 'off',
-        '@stylistic/js/indent': 'off',
+        '@stylistic/indent': 'off',
         'comma-spacing': 'off',
     },
 }, {
     name: 'putout: json: filesystem',
     files: ['**/.filesystem.json'],
     plugins: {
-        '@stylistic': stylisticJs,
+        '@stylistic': stylistic,
         putout,
     },
     rules: {

packages/eslint-plugin-putout/lib/jsx.mjs

@@ -1,20 +1,20 @@
-import stylisticJsx from '@stylistic/eslint-plugin-jsx';
+import stylistic from '@stylistic/eslint-plugin';
 import react from 'eslint-plugin-react';
 
 export const jsx = {
     name: 'putout: jsx',
     rules: {
-        '@stylistic/js/no-extra-parens': 'off',
-        '@stylistic/jsx/jsx-indent': 'error',
-        '@stylistic/jsx/jsx-wrap-multilines': ['error', {
+        '@stylistic/no-extra-parens': 'off',
+        '@stylistic/jsx-indent': 'error',
+        '@stylistic/jsx-wrap-multilines': ['error', {
             arrow: 'parens-new-line',
             return: 'parens-new-line',
             declaration: 'parens-new-line',
         }],
     },
     plugins: {
         react,
-        '@stylistic/jsx': stylisticJsx,
+        '@stylistic': stylistic,
     },
     settings: {
         react: {

packages/eslint-plugin-putout/lib/markdown.mjs

@@ -7,7 +7,7 @@ import {jsx} from './jsx.mjs';
 const [ts, tsx] = tsConfig;
 
 const commonRules = {
-    '@stylistic/js/eol-last': [
+    '@stylistic/eol-last': [
         'error',
         'never',
     ],
@@ -96,7 +96,7 @@ export default [{
     name: 'putout: md: json',
     files: ['**/*.md{json}'],
     rules: {
-        '@stylistic/js/eol-last': [
+        '@stylistic/eol-last': [
             'error',
             'never',
         ],

packages/eslint-plugin-putout/lib/ts.mjs

@@ -2,14 +2,14 @@ import {rules} from '@putout/eslint-config';
 import parser from '@typescript-eslint/parser';
 import tseslint from 'typescript-eslint';
 import tsPlugin from '@typescript-eslint/eslint-plugin';
-import stylisticTs from '@stylistic/eslint-plugin-ts';
+import stylistic from '@stylistic/eslint-plugin';
 import {jsx} from './jsx.mjs';
 import * as plugin from './plugin.mjs';
 
 const {assign} = Object;
 
 const reEnable = (rule) => ({
-    [`@stylistic/ts/${rule}`]: 'error',
+    [`@stylistic/${rule}`]: 'error',
 });
 
 const warnOnUnsupportedTypeScriptVersion = false;
@@ -26,7 +26,7 @@ const handled = {
 };
 
 const broken = {
-    '@stylistic/ts/indent': 'off',
+    '@stylistic/indent': 'off',
 };
 
 const slow = {
@@ -42,24 +42,19 @@ const extensionRules = {
     'no-undef': 'off',
     'no-var': 'off',
 
-    '@stylistic/ts/comma-spacing': 'error',
+    '@stylistic/comma-spacing': 'error',
 
-    '@stylistic/ts/lines-between-class-members': 'off',
+    '@stylistic/lines-between-class-members': 'off',
 
-    '@stylistic/js/padding-line-between-statements': 'off',
-    '@stylistic/ts/padding-line-between-statements': convertPaddingLines(rules['@stylistic/js/padding-line-between-statements']),
+    '@stylistic/padding-line-between-statements': convertPaddingLines(rules['@stylistic/padding-line-between-statements']),
 
-    '@stylistic/js/object-curly-spacing': 'off',
-    '@stylistic/ts/object-curly-spacing': rules['@stylistic/js/object-curly-spacing'],
+    '@stylistic/object-curly-spacing': rules['@stylistic/object-curly-spacing'],
 
-    '@stylistic/js/semi': 'off',
-    '@stylistic/ts/semi': rules['@stylistic/js/semi'],
+    '@stylistic/semi': rules['@stylistic/semi'],
 
-    '@stylistic/js/no-extra-parens': 'off',
-    '@stylistic/ts/no-extra-parens': rules['@stylistic/js/no-extra-parens'],
+    '@stylistic/no-extra-parens': rules['@stylistic/no-extra-parens'],
 
-    '@stylistic/js/space-before-function-paren': 'off',
-    '@stylistic/ts/space-before-function-paren': rules['@stylistic/js/space-before-function-paren'],
+    '@stylistic/space-before-function-paren': rules['@stylistic/space-before-function-paren'],
 
     ...reEnable('object-curly-spacing'),
     ...reEnable('func-call-spacing'),
@@ -99,7 +94,7 @@ const ts = {
     },
     plugins: {
         '@typescript-eslint': tsPlugin,
-        '@stylistic/ts': stylisticTs,
+        '@stylistic': stylistic,
         'putout': plugin,
     },
     rules: {
@@ -109,7 +104,7 @@ const ts = {
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/no-empty-function': 'off',
-        '@stylistic/ts/type-annotation-spacing': 'error',
+        '@stylistic/type-annotation-spacing': 'error',
     },
 };
 

packages/eslint-plugin-putout/package.json

@@ -44,9 +44,7 @@
     "@putout/eslint": "^4.0.0",
     "@putout/eslint-config": "^11.0.0",
     "@putout/eslint-flat": "^3.0.0",
-    "@stylistic/eslint-plugin-js": "^4.0.1",
-    "@stylistic/eslint-plugin-jsx": "^4.0.1",
-    "@stylistic/eslint-plugin-ts": "^4.0.1",
+    "@stylistic/eslint-plugin": "^4.4.0",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
     "align-spaces": "^2.0.0",
@@ -78,7 +76,7 @@
   },
   "peerDependencies": {
     "eslint": ">=9",
-    "putout": ">=39"
+    "putout": ">=40"
   },
   "license": "MIT",
   "publishConfig": {

packages/eslint-plugin-putout/test/eslint.mjs

@@ -127,14 +127,14 @@ test('eslint-plugin-putout: ts: keyword-spacing', async ({comparePlaces}) => {
             column: 9,
             line: 1,
         },
-        rule: '@stylistic/ts/object-curly-spacing (eslint)',
+        rule: '@stylistic/object-curly-spacing (eslint)',
     }, {
         message: `There should be no space before '}'.`,
         position: {
             column: 11,
             line: 1,
         },
-        rule: '@stylistic/ts/object-curly-spacing (eslint)',
+        rule: '@stylistic/object-curly-spacing (eslint)',
     }]);
 });
 

packages/eslint/lib/eslint.spec.js

@@ -17,7 +17,7 @@ test('putout: eslint: places', async (t) => {
     });
 
     const expected = [{
-        rule: '@stylistic/js/semi (eslint)',
+        rule: '@stylistic/semi (eslint)',
         message: 'Missing semicolon.',
         position: {
             line: 1,
@@ -327,7 +327,7 @@ test('putout: eslint: output', async (t) => {
 test('putout: eslint: output: config', async (t) => {
     const config = {
         rules: {
-            '@stylistic/js/semi': 'off',
+            '@stylistic/semi': 'off',
         },
     };
 

packages/plugin-parens/eslint.config.js

@@ -6,7 +6,7 @@ export const match = {
     '*.md{ts}': {
         '@typescript-eslint/no-unused-expressions': 'off',
         'no-unsafe-optional-chaining': 'off',
-        '@stylistic/ts/no-extra-parens': 'off',
+        '@stylistic/no-extra-parens': 'off',
         '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
     },
 };

packages/plugin-typescript/README.md

@@ -464,16 +464,16 @@ type SuperType = {
 
 ```ts
 interface Hello {
-    'hello': any;
-    'hello': string;
+    hello: any;
+    hello: string;
 }
 ```
 
 ### ✅ Example of correct code
 
 ```ts
 interface Hello {
-    'hello': string;
+    hello: string;
 }
 ```
 

packages/test/lib/eslint/eslint.spec.mjs

@@ -91,14 +91,14 @@ test('test: eslint: comparePlaces', async ({comparePlaces}) => {
             column: 1,
             line: 2,
         },
-        rule: '@stylistic/js/operator-linebreak (eslint)',
+        rule: '@stylistic/operator-linebreak (eslint)',
     }]);
 });
 
 test('test: eslint: comparePlaces: overrides', async ({comparePlaces}) => {
     const overrides = {
         rules: {
-            '@stylistic/js/operator-linebreak': 'off',
+            '@stylistic/operator-linebreak': 'off',
         },
     };
 
@@ -145,7 +145,7 @@ test('test: eslint: comparePlaces: overrides: ESM', async ({comparePlaces}) => {
 test('test: eslint: noProcess: overrides', async ({noProcess}) => {
     const overrides = {
         rules: {
-            '@stylistic/js/operator-linebreak': 'off',
+            '@stylistic/operator-linebreak': 'off',
         },
     };