eslint-plugin-putout 13.5.0 → 13.9.0

package/README.md

@@ -52,6 +52,7 @@ Then configure the rules you want to use under the rules section.
         "putout/remove-newline-from-empty-object": "error",
         "putout/remove-empty-newline-before-first-specifier": "error",
         "putout/remove-empty-newline-after-last-specifier": "error",
+        "putout/remove-empty-newline-after-import": "error",
         "putout/remove-empty-specifiers": "error",
         "putout/objects-braces-inside-array": "error",
         "putout/object-init": "error"
@@ -80,6 +81,7 @@ Then configure the rules you want to use under the rules section.
 - [Remove newline from empty object](/packages/eslint-plugin-putout/lib/remove-newline-from-empty-object)
 - [Remove empty newline before first specifier](/packages/eslint-plugin-putout/lib/remove-empty-newline-before-first-specifier)
 - [Remove empty newline after last specifier](/packages/eslint-plugin-putout/lib/remove-empty-newline-after-last-specifier)
+- [Remove empty newline after import](/packages/eslint-plugin-putout/lib/remove-empty-newline-after-import)
 - [Remove empty specifiers](/packages/eslint-plugin-putout/lib/remove-empty-specifiers)
 - [Objects braces inside array](/packages/eslint-plugin-putout/lib/objects-braces-inside-array)
 - [Object init](/packages/eslint-plugin-putout/lib/object-init)
@@ -119,6 +121,7 @@ Disabled 🐊`Putout` rules:
 - [`remove-unreferenced-variables`](https://github.com/coderaiser/putout/tree/24.1.0/packages);
 - [`remove-useless-return`](https://github.com/coderaiser/putout/tree/master/remove-useless-return);
 - [`remove-useless-arguments`](https://github.com/coderaiser/putout/tree/master/remove-useless-arguments);
+- [`remove-useless-spread`](https://github.com/coderaiser/putout/tree/master/remove-useless-spread/#readme);
 - [`remove-useless-variables/rename`](https://github.com/coderaiser/putout/tree/master/remove-useless-arguments#rename);
 - [`remove-skip`](https://github.com/coderaiser/putout/tree/v24.0.0/packages/remove-skip);
 - [`remove-only`](https://github.com/coderaiser/putout/tree/v24.0.0/packages/remove-only);
@@ -130,4 +133,3 @@ Disabled 🐊`Putout` rules:
 ### safe+align
 
 When you want to enable ability to align spaces on empty lines, while have all benefits of `safe` preset: use `safe+align`.
-

package/lib/function-declaration-paren-newline/index.js

@@ -14,6 +14,7 @@ module.exports.fix = ({text}) => fixNewLines(text);
 
 module.exports.include = () => [
     'FunctionDeclaration',
+    'FunctionExpression',
     'ArrowFunctionExpression',
 ];
 

package/lib/index.js

@@ -42,6 +42,7 @@ module.exports.rules = {
     ...getWrapRule('tape-add-newline-between-tests'),
     ...getWrapRule('tape-remove-newline-before-t-end'),
     ...getRule('putout'),
+    ...getRule('remove-empty-newline-after-import'),
 };
 
 const config = require('@putout/eslint-config');
@@ -71,6 +72,7 @@ const recommended = {
         'putout/remove-newline-from-empty-object': 'error',
         'putout/remove-empty-newline-before-first-specifier': 'error',
         'putout/remove-empty-newline-after-last-specifier': 'error',
+        'putout/remove-empty-newline-after-import': 'error',
         'putout/remove-empty-specifiers': 'error',
         'putout/objects-braces-inside-array': 'error',
         'putout/object-init': 'error',
@@ -114,6 +116,7 @@ const safe = {
                 'remove-useless-return': 'off',
                 'remove-useless-arguments': 'off',
                 'remove-useless-variables/rename': 'off',
+                'remove-useless-spread': 'off',
                 'remove-unreferenced-variables': 'off',
                 'tape/remove-skip': 'off',
                 'tape/remove-only': 'off',

package/lib/no-unresolved/index.js

@@ -16,10 +16,7 @@ const RELATIVE = '\\.\\.?\\/?';
 const isRelativeStart = (a) => RegExp(`^${RELATIVE}`).test(a);
 const isRelativeEnd = (a) => RegExp(`${RELATIVE}$`).test(a);
 const getDir = (a) => a === '<input>' ? cwd : dirname(a);
-const getValue = (node) => {
-    const {source} = node;
-    return source?.value;
-};
+const getValue = ({source}) => source?.value;
 
 module.exports.category = 'errors';
 module.exports.report = () => 'Always add an extension to relative imports';

package/lib/remove-empty-newline-after-import/README.md

@@ -0,0 +1,24 @@
+# Remove empty newline after import (`remove-empty-newline-after-import`)
+
+## Rule Details
+
+This rule aims to remove empty newline after `import`.
+
+Examples of **incorrect** code for this rule:
+
+```js
+import {readFile} from 'fs';
+
+import {promisify} from 'util';
+
+import index from './index.js';
+```
+
+Examples of **correct** code for this rule:
+
+```js
+import {readFile} from 'fs';
+import {promisify} from 'util';
+
+import index from './index.js';
+```

package/lib/remove-empty-newline-after-import/index.js

@@ -0,0 +1,77 @@
+'use strict';
+
+const {isBuiltIn} = require('./is-built-in');
+const isLocal = (a) => /^\./.test(a.source.value);
+const isNode = (a) => isBuiltIn(a.source.value);
+
+const isSameGroup = (a, b) => {
+    if (isLocal(a) && isLocal(b))
+        return true;
+    
+    if (isNode(a) && isNode(b))
+        return true;
+    
+    return false;
+};
+
+module.exports = {
+    meta: {
+        type: 'suggestion',
+        docs: {
+            description: 'Putout',
+            category: 'putout',
+            recommended: true,
+        },
+        fixable: 'code',
+    },
+    
+    create(context) {
+        return {
+            ImportDeclaration(node) {
+                const source = context.getSourceCode();
+                const text = source.getText(node);
+                const newline = source.getText(node, 0, 2).replace(text, '');
+                
+                if (node.specifiers.length > 1)
+                    return;
+                
+                if (newline !== '\n\n')
+                    return;
+                
+                const nextNode = context.getNodeByRangeIndex(node.range[1] + 2);
+                
+                if (!nextNode || nextNode.type !== 'ImportDeclaration')
+                    return;
+                
+                if (nextNode.specifiers.length > 1)
+                    return;
+                
+                const allImports = getImports(node.parent);
+                
+                if (!isSameGroup(node, nextNode) && allImports.length > 2)
+                    return;
+                
+                context.report({
+                    node,
+                    message: 'Remove empty newline after import',
+                    
+                    fix(fixer) {
+                        return [
+                            fixer.removeRange([node.range[1], node.range[1] + 1]),
+                        ];
+                    },
+                });
+            },
+        };
+    },
+};
+
+function getImports(node) {
+    const imports = [];
+    for (const current of node.body) {
+        if (current.type === 'ImportDeclaration')
+            imports.push(current);
+    }
+    
+    return imports;
+}

package/lib/remove-empty-newline-after-import/is-built-in.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const builtInsList = [
+    'assert',
+    'async_hooks',
+    'buffer',
+    'child_process',
+    'cluster',
+    'console',
+    'crypto',
+    'dgram',
+    'diagnostics_channel',
+    'dns',
+    'domain',
+    'fs',
+    'fs/promises',
+    'http',
+    'http2',
+    'https',
+    'inspector',
+    'module',
+    'os',
+    'path',
+    'perf_hooks',
+    'process',
+    'punycode',
+    'querystring',
+    'readline',
+    'repl',
+    'stream',
+    'string_decoder',
+    'timers',
+    'tls',
+    'trace_events',
+    'tty',
+    'url',
+    'util',
+    'vm',
+    'web_crypto_api',
+    'web_streams_api',
+    'wasi',
+    'worker_threads',
+    'zlib',
+];
+
+module.exports.isBuiltIn = (name) => builtInsList.includes(name);

package/lib/single-property-destructuring/README.md

@@ -9,22 +9,23 @@ This rule aims to shorten destructuring of one property.
 Examples of **incorrect** code for this rule:
 
 ```js
+import {
+    password,
+} from './user.js';
+
 const {
     username,
 } = user;
 
-import {
-    password,
-} from './user.js';
 ```
 
 Examples of **correct** code for this rule:
 
 ```js
-const {username} = user;
 import {password} from './user.js';
-
 import {
     helloWorld as simpleHello,
 } from './hello.js';
+
+const {username} = user;
 ```

package/lib/ts.js

@@ -44,7 +44,7 @@ const extensionRules = {
     '@typescript-eslint/object-curly-spacing': 'error',
     
     'padding-line-between-statements': 'off',
-    '@typescript-eslint/padding-line-between-statements': rules['padding-line-between-statements'],
+    '@typescript-eslint/padding-line-between-statements': convertPaddingLines(rules['padding-line-between-statements']),
     
     'quotes': 'off',
     '@typescript-eslint/quotes': rules.quotes,
@@ -101,3 +101,24 @@ module.exports = [
     },
 ];
 
+function convertPaddingLines([state, ...lines]) {
+    const newLines = [];
+    for (const line of lines) {
+        let {prev, next} = line;
+        
+        if (prev.includes('cjs-'))
+            prev = prev.replace('cjs-', '');
+        
+        if (next.includes('cjs-'))
+            next = next.replace('cjs-', '');
+        
+        newLines.push({
+            ...line,
+            prev,
+            next,
+        });
+    }
+    
+    return [state, ...newLines];
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "13.5.0",
+  "version": "13.9.0",
   "type": "commonjs",
   "description": "eslint plugin for putout",
   "release": false,
@@ -48,6 +48,8 @@
     "typescript": "^4.5.2"
   },
   "devDependencies": {
+    "@babel/plugin-syntax-typescript": "^7.12.1",
+    "@putout/test": "^4.3.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-eslint-plugin": "^3.2.0",
@@ -55,9 +57,8 @@
     "mocha": "^9.0.1",
     "montag": "^1.0.0",
     "simport": "^1.2.0",
-    "supertape": "^6.6.0",
-    "try-to-catch": "^3.0.0",
-    "@babel/plugin-syntax-typescript": "^7.12.1"
+    "supertape": "^6.13.1",
+    "try-to-catch": "^3.0.0"
   },
   "engines": {
     "node": ">=14"