Update: report rename id destructuring in id-blacklist (fixes #12807)

eslint · Feb 16, 2020 · 5807c19 · 5807c19
1 parent 41de9df
commit 5807c19
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 5 deletions.
diff --git a/lib/rules/id-blacklist.js b/lib/rules/id-blacklist.js
@@ -81,6 +81,27 @@ module.exports = {
             );
         }
 
+        /**
+         * Checks whether the given node is a renamed identifier node in an ObjectPattern destructuring.
+         *
+         * Examples:
+         * const { a : b } = foo; // node `a` is renamed node.
+         * @param {ASTNode} node `Identifier` node to check.
+         * @returns {boolean} `true` if the node is a renamed node in an ObjectPattern destructuring.
+         */
+        function isRenamedInDestructuring(node) {
+            const parent = node.parent;
+
+            return (
+                (
+                    parent.type === "Property" &&
+                    parent.parent.type === "ObjectPattern" &&
+                    parent.value !== node &&
+                    parent.key === node
+                )
+            );
+        }
+
         /**
          * Verifies if we should report an error or not.
          * @param {ASTNode} node The node to check
@@ -92,8 +113,8 @@ module.exports = {
             return (
                 parent.type !== "CallExpression" &&
                 parent.type !== "NewExpression" &&
-                parent.parent.type !== "ObjectPattern" &&
                 !isRenamedImport(node) &&
+                !isRenamedInDestructuring(node) &&
                 isInvalid(node.name)
             );
         }
@@ -141,6 +162,16 @@ module.exports = {
                         if (isInvalid(name)) {
                             report(node);
                         }
+
+                    // Report the last identifier in an ObjectPattern destructuring.
+                    } else if (
+                        !effectiveParent.computed &&
+                        effectiveParent.type === "Property" && effectiveParent.value === node.parent &&
+                        effectiveParent.parent.type === "ObjectPattern" && effectiveParent.parent.parent.left === effectiveParent.parent
+                    ) {
+                        if (isInvalid(name)) {
+                            report(node);
+                        }
                     }
 
                 } else if (shouldReport(node)) {

diff --git a/tests/lib/rules/id-blacklist.js b/tests/lib/rules/id-blacklist.js
@@ -77,22 +77,22 @@ ruleTester.run("id-blacklist", rule, {
         },
         {
             code: "const {foo: bar} = baz",
-            options: ["foo", "bar"],
+            options: ["foo"],
             parserOptions: { ecmaVersion: 6 }
         },
         {
             code: "const {foo: {bar: baz}} = qux",
-            options: ["foo", "bar", "baz"],
+            options: ["foo", "bar"],
             parserOptions: { ecmaVersion: 6 }
         },
         {
             code: "function foo({ bar: baz }) {}",
-            options: ["bar", "baz"],
+            options: ["bar"],
             parserOptions: { ecmaVersion: 6 }
         },
         {
             code: "function foo({ bar: {baz: qux} }) {}",
-            options: ["bar", "baz", "qux"],
+            options: ["bar", "baz"],
             parserOptions: { ecmaVersion: 6 }
         },
         {
@@ -126,6 +126,11 @@ ruleTester.run("id-blacklist", rule, {
         {
             code: "foo.bar",
             options: ["bar"]
+        },
+        {
+            code: "({foo: obj.bar.bar.bar.baz} = {});",
+            options: ["foo", "bar"],
+            parserOptions: { ecmaVersion: 6 }
         }
     ],
     invalid: [
@@ -522,6 +527,97 @@ ruleTester.run("id-blacklist", rule, {
             errors: [
                 error
             ]
+        },
+        {
+            code: "const {foo} = baz",
+            options: ["foo"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "foo" },
+                    type: "Identifier",
+                    column: 8
+                }
+            ]
+        },
+        {
+            code: "const {foo: bar} = baz",
+            options: ["foo", "bar"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "bar" },
+                    type: "Identifier",
+                    column: 13
+                }
+            ]
+        },
+        {
+            code: "const {foo: {bar: baz}} = qux",
+            options: ["foo", "bar", "baz"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "baz" },
+                    type: "Identifier",
+                    column: 19
+                }
+            ]
+        },
+        {
+            code: "function foo({ bar: baz }) {}",
+            options: ["bar", "baz"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "baz" },
+                    type: "Identifier",
+                    column: 21
+                }
+            ]
+        },
+        {
+            code: "function foo({ bar: {baz: qux} }) {}",
+            options: ["bar", "baz", "qux"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "qux" },
+                    type: "Identifier",
+                    column: 27
+                }
+            ]
+        },
+        {
+            code: "({foo: obj.bar} = baz);",
+            options: ["bar"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "bar" },
+                    type: "Identifier",
+                    column: 12
+                }
+            ]
+        },
+        {
+            code: "({foo: obj.bar.bar.bar.baz} = {});",
+            options: ["bar", "baz"],
+            parserOptions: { ecmaVersion: 6 },
+            errors: [
+                {
+                    messageId: "blacklisted",
+                    data: { name: "baz" },
+                    type: "Identifier",
+                    column: 24
+                }
+            ]
         }
     ]
 });