eslint-plugin-putout 20.0.0 → 21.0.1

package/lib/destructuring-as-function-argument/index.js

@@ -13,9 +13,7 @@ module.exports.fix = ({text}) => {
         .replace(', }', '}');
 };
 
-// can't use because of an error
-// ':has(ArrowFunctionExpression, FunctionExpression, FunctionDeclaration) > .params[type=ObjectPattern]'
-// Error: Unknown node type JSXElement
+// can't use because of an error// ':has(ArrowFunctionExpression, FunctionExpression, FunctionDeclaration) > .params[type=ObjectPattern]'// Error: Unknown node type JSXElement
 module.exports.include = () => [
     'ArrowFunctionExpression > .params[type=ObjectPattern]',
     'FunctionExpression > .params[type=ObjectPattern]',

package/lib/index.js

@@ -51,6 +51,7 @@ module.exports.rules = {
     ...getRule('remove-empty-newline-after-import'),
     ...getRule('remove-empty-newline-between-declarations'),
 };
+
 const config = require('@putout/eslint-config');
 const {rules} = config;
 

package/lib/json.js

@@ -6,31 +6,31 @@ module.exports = [{
         '*{json}',
     ],
     rules: {
-        'quotes': [
+        'no-undef': 'off',
+        '@stylistic/js/quotes': [
             'error',
             'double',
         ],
-        'quote-props': [
+        '@stylistic/js/quote-props': [
             'error',
             'always',
         ],
-        'comma-dangle': [
+        '@stylistic/js/comma-dangle': [
             'error',
             'never',
         ],
-        'comma-spacing': 'off',
-        'function-paren-newline': 'off',
-        'no-undef': 'off',
-        'eol-last': [
+        '@stylistic/js/comma-spacing': 'off',
+        '@stylistic/js/function-paren-newline': 'off',
+        '@stylistic/js/eol-last': [
             'error',
             'always',
         ],
-        'no-multi-spaces': 'off',
+        '@stylistic/js/no-multi-spaces': 'off',
     },
 }, {
     files: 'package.json',
     rules: {
-        indent: [
+        '@stylistic/js/indent': [
             'error',
             2,
         ],
@@ -38,11 +38,11 @@ module.exports = [{
 }, {
     files: '*ignore{json}',
     rules: {
-        'comma-dangle': 'off',
+        '@stylistic/js/comma-dangle': 'off',
     },
 }, {
     files: '*.yml{json}',
     rules: {
-        indent: 'off',
+        '@stylistic/js/indent': 'off',
     },
 }];

package/lib/jsx.js

@@ -2,15 +2,15 @@
 
 const jsx = {
     rules: {
-        'no-extra-parens': 'off',
-        'react/jsx-indent': 'error',
-        'react/jsx-wrap-multilines': ['error', {
+        '@stylistic/js/no-extra-parens': 'off',
+        '@stylistic/jsx/jsx-indent': 'error',
+        '@stylistic/jsx/jsx-wrap-multilines': ['error', {
             arrow: 'parens-new-line',
             return: 'parens-new-line',
             declaration: 'parens-new-line',
         }],
     },
-    plugins: ['react'],
+    plugins: ['react', '@stylistic/jsx'],
     settings: {
         react: {
             version: 'latest',

package/lib/markdown.js

@@ -6,12 +6,12 @@ const [ts, tsx] = require('./ts');
 const {jsx} = require('./jsx');
 
 const commonRules = {
-    'no-undef': 'off',
-    'no-empty': 'off',
-    'eol-last': [
+    '@stylistic/js/eol-last': [
         'error',
         'never',
     ],
+    'no-undef': 'off',
+    'no-empty': 'off',
     'no-unreachable': 'off',
     'no-constant-condition': 'off',
     'n/no-extraneous-require': 'off',
@@ -82,7 +82,7 @@ module.exports = [{
 }, {
     files: '*.md{json}',
     rules: {
-        'eol-last': [
+        '@stylistic/js/eol-last': [
             'error',
             'never',
         ],

package/lib/putout/sync/index.js

@@ -15,7 +15,6 @@ const parseOptions = require('putout/parse-options');
 const {parseError} = require('../parse-error');
 
 const cwd = process.cwd();
-
 const EMPTY_VISITORS = {};
 
 module.exports = ({context, options}) => {
@@ -78,7 +77,6 @@ module.exports = ({context, options}) => {
 
 const fix = ({ast, text, node, source, resultOptions}) => (fixer) => {
     const includeComments = true;
-    
     const lastToken = source.getLastToken(node, {
         includeComments,
     });
@@ -86,7 +84,6 @@ const fix = ({ast, text, node, source, resultOptions}) => (fixer) => {
     transform(ast, text, resultOptions);
     
     const [, last] = lastToken.range;
-    
     const code = print(ast);
     
     return fixer.replaceTextRange([0, last], code);

package/lib/ts.js

@@ -3,56 +3,44 @@
 const {rules} = require('@putout/eslint-config');
 const jsx = require('./jsx');
 
+const reEnable = (rule) => ({
+    [`@stylistic/ts/${rule}`]: 'error',
+});
+
 const warnOnUnsupportedTypeScriptVersion = false;
 
 const extensionRules = {
     'no-undef': 'off',
     'no-var': 'off',
-    '@typescript-eslint/brace-style': 'off', // putout/object-property-newline instead
-    'comma-dangle': 'off',
-    '@typescript-eslint/comma-dangle': rules['comma-dangle'],
     
-    'comma-spacing': 'off',
-    '@typescript-eslint/comma-spacing': 'error',
-    '@typescript-eslint/dot-notation': 'off', // requires type information
-    'func-call-spacing': 'off',
-    '@typescript-eslint/func-call-spacing': 'error',
-    '@typescript-eslint/indent': 'off', // broken
-    '@typescript-eslint/lines-between-class-members': 'off',
-    '@typescript-eslint/no-array-constructor': 'off',
+    '@stylistic/ts/comma-spacing': 'error',
     
-    'no-extra-parens': 'off',
-    '@typescript-eslint/no-extra-parens': 'error',
+    '@stylistic/ts/indent': 'off', // broken
+    '@stylistic/brace-style': 'off', // putout/object-property-newline instead
+    '@stylistic/ts/lines-between-class-members': 'off',
     
-    'no-extra-semi': 'off',
-    '@typescript-eslint/no-extra-semi': 'error',
+    '@stylistic/js/padding-line-between-statements': 'off',
+    '@stylistic/ts/padding-line-between-statements': convertPaddingLines(rules['@stylistic/js/padding-line-between-statements']),
     
+    '@stylistic/js/semi': 'off',
+    '@stylistic/ts/semi': rules['@stylistic/js/semi'],
+    
+    '@stylistic/js/space-before-function-paren': 'off',
+    '@stylistic/ts/space-before-function-paren': rules['@stylistic/js/space-before-function-paren'],
+    
+    ...reEnable('object-curly-spacing'),
+    ...reEnable('func-call-spacing'),
+    '@typescript-eslint/no-array-constructor': 'off',
+    '@typescript-eslint/dot-notation': 'off', // requires type information
+    '@typescript-eslint/no-extra-parens': 'error',
     '@typescript-eslint/no-implied-eval': 'off',
     
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': 'error',
     
-    'object-curly-spacing': 'off',
-    '@typescript-eslint/object-curly-spacing': 'error',
-    
-    'padding-line-between-statements': 'off',
-    '@typescript-eslint/padding-line-between-statements': convertPaddingLines(rules['padding-line-between-statements']),
-    
-    'quotes': 'off',
-    '@typescript-eslint/quotes': rules.quotes,
-    
     '@typescript-eslint/require-await': 'off',
     
-    'semi': 'off',
-    '@typescript-eslint/semi': rules.semi,
-    
-    'space-before-function-paren': 'off',
-    '@typescript-eslint/space-before-function-paren': rules['space-before-function-paren'],
-    
-    'space-infix-ops': 'off',
-    '@typescript-eslint/space-infix-ops': rules['space-infix-ops'],
-    
-    'no-redecalre': 'off',
+    'no-redeclare': 'off',
     '@typescript-eslint/no-redeclare': 'error',
 };
 
@@ -65,7 +53,7 @@ const ts = {
             jsx: false,
         },
     },
-    plugins: ['@typescript-eslint'],
+    plugins: ['@typescript-eslint', '@stylistic/ts'],
     extends: ['plugin:@typescript-eslint/recommended'],
     rules: {
         ...extensionRules,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "20.0.0",
+  "version": "21.0.1",
   "type": "commonjs",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
@@ -43,7 +43,9 @@
     "@eslint/eslintrc": "^2.0.2",
     "@putout/engine-parser": "^9.0.0",
     "@putout/eslint": "^2.0.0",
-    "@putout/eslint-config": "^7.0.0",
+    "@putout/eslint-config": "^8.0.0",
+    "@stylistic/eslint-plugin-jsx": "^0.1.1",
+    "@stylistic/eslint-plugin-ts": "^0.1.1",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "align-spaces": "^1.0.0",