eslint-plugin-putout 17.6.0 → 17.7.0

package/README.md

@@ -133,24 +133,43 @@ Disabled **ESLint** rules:
 Disabled 🐊**Putout** rules:
 
 - ❌ [`apply-template-literals`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-empty#readme);
+
 - ❌ [`remove-empty`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-empty#readme);
+
 - ❌ [`nodejs/remove-process-exit`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-nodejs#remove-process-exit#readme);
+
 - ❌ [`remove-unused-variables`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-unused-variables#readme);
+
 - ❌ [`typescript/remove-unused-types`](https://github.com/coderaiser/putout/tree/v24.0.2/packages/plugin-typescript#remove-unused-types#readme);
-- ❌ [`remove-unused-expressions`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-removeunused-expressions#readme);
-- ❌ [`remove-unreferenced-variables`](https://github.com/coderaiser/putout/tree/29.0.0/packages/plugin-remove-unreferenced-variables#readme);
+
+- ❌ [`remove-unused-expressions`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-unused-expressions#readme);
+
+- ❌ [`remove-unreferenced-variables`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-unreferenced-variables#readme);
+
 - ❌ [`remove-useless-arguments`](https://github.com/coderaiser/putout/tree/master/packages/plugin-remove-useless-arguments#readme);
+
 - ❌ [`remove-useless-return`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-useless-return#readme);
-- ❌ [`remove-useless-spread`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-useless-spread/#readme#readme);
-- ❌ [`remove-useless-variables/rename`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-useless-arguments#rename#readme);
+
+- ❌ [`remove-useless-spread`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-useless-spread/#readme);
+
+- ❌ [`remove-useless-variables/rename`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-useless-variables#rename);
+
 - ❌ [`remove-skip`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-tape#remove-skip);
+
 - ❌ [`remove-only`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-tape#remove-only);
+
 - ❌ [`remove-console`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-console#readme);
+
 - ❌ [`remove-debugger`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-debugger#readme);
+
 - ❌ [`remove-unreachable-code`](https://github.com/coderaiser/putout/tree/v29.0.0/packages/plugin-remove-unreachable-code#readme);
+
 - ❌ [`for-of/for`](https://github.com/coderaiser/putout/tree/v29.1.2/packages/plugin-convert-for-to-for-of#readme);
-- ❌ [`for-of/remove-useless`](https://github.com/coderaiser/putout/tree/v29.1.2/packages/plugin-remove-useless-for-of#readme);
-- ❌ [`for-of/remove-unused-variables`](https://github.com/coderaiser/putout/tree/29.1.2/packages/plugin-for-of#remove-unused-variables);
+
+- ❌ [`for-of/remove-useless`](https://github.com/coderaiser/putout/tree/v29.7.1/packages/plugin-for-of#remove-useless);
+
+- ❌ [`for-of/remove-unused-variables`](https://github.com/coderaiser/putout/tree/29.7.1/packages/plugin-for-of#remove-unused-variables);
+
 - ❌ [`maybe/noop`](https://github.com/coderaiser/putout/tree/29.2.4/packages/plugin-maybe#noop);
 
 ### safe+align

package/lib/multiple-properties-destructuring/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isImportDeclaration} = require('putout').types;
+const {parseImportSpecifiers} = require('parse-import-specifiers');
 const {
     isCorrectLoc,
     isCorrectImportLoc,
@@ -9,8 +10,15 @@ const {
 module.exports.category = 'destructuring';
 module.exports.report = () => 'Keep each property on separate lines when using multiple destructuring properties';
 
-module.exports.include = ({options}) => {
+const parseOptions = (options) => {
     const {minProperties = 2} = options[0] || {};
+    return {
+        minProperties,
+    };
+};
+
+module.exports.include = ({options}) => {
+    const {minProperties} = parseOptions(options);
     
     return [
         `VariableDeclarator[id.type="ObjectPattern"][id.properties.length>${minProperties}]`,
@@ -18,16 +26,23 @@ module.exports.include = ({options}) => {
     ];
 };
 
-module.exports.filter = ({node}) => {
+module.exports.filter = ({node}, options) => {
+    const {minProperties} = parseOptions(options);
+    const {line} = node.loc.start;
     const {
         id,
         specifiers,
         parent,
     } = node;
-    const {line} = node.loc.start;
     
-    if (isImportDeclaration(node))
+    if (isImportDeclaration(node)) {
+        const {defaults, imports} = parseImportSpecifiers(node.specifiers);
+        
+        if (defaults.length === 1 && imports.length < minProperties)
+            return false;
+        
         return !isCorrectImportLoc(line, specifiers);
+    }
     
     if (parent.parent && parent.parent.type === 'ForOfStatement')
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "17.6.0",
+  "version": "17.7.0",
   "type": "commonjs",
   "description": "ESLint plugin for 🐊Putout",
   "release": false,
@@ -49,8 +49,9 @@
     "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@typescript-eslint/parser": "^5.4.0",
     "align-spaces": "^1.0.0",
-    "eslint-plugin-n": "^15.2.4",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-react": "^7.32.2",
+    "parse-import-specifiers": "^1.0.1",
     "try-catch": "^3.0.0",
     "typescript": "^5.0.4"
   },