eslint 8.18.0 → 8.21.0

package/lib/rules/no-mixed-requires.js

@@ -20,7 +20,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `require` calls to be mixed with regular variable declarations",
+            description: "Disallow `require` calls to be mixed with regular variable declarations",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-mixed-requires"
         },

package/lib/rules/no-mixed-spaces-and-tabs.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow mixed spaces and tabs for indentation",
+            description: "Disallow mixed spaces and tabs for indentation",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-mixed-spaces-and-tabs"
         },

package/lib/rules/no-multi-assign.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow use of chained assignment expressions",
+            description: "Disallow use of chained assignment expressions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-multi-assign"
         },

package/lib/rules/no-multi-spaces.js

@@ -17,7 +17,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow multiple spaces",
+            description: "Disallow multiple spaces",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-multi-spaces"
         },

package/lib/rules/no-multi-str.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow multiline strings",
+            description: "Disallow multiline strings",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-multi-str"
         },

package/lib/rules/no-multiple-empty-lines.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow multiple empty lines",
+            description: "Disallow multiple empty lines",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-multiple-empty-lines"
         },

package/lib/rules/no-native-reassign.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow assignments to native objects or read-only global variables",
+            description: "Disallow assignments to native objects or read-only global variables",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-native-reassign"
         },

package/lib/rules/no-negated-condition.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow negated conditions",
+            description: "Disallow negated conditions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-negated-condition"
         },

package/lib/rules/no-negated-in-lhs.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow negating the left operand in `in` expressions",
+            description: "Disallow negating the left operand in `in` expressions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-negated-in-lhs"
         },

package/lib/rules/no-nested-ternary.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow nested ternary expressions",
+            description: "Disallow nested ternary expressions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-nested-ternary"
         },

package/lib/rules/no-new-func.js

@@ -27,7 +27,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `new` operators with the `Function` object",
+            description: "Disallow `new` operators with the `Function` object",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-new-func"
         },

package/lib/rules/no-new-object.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `Object` constructors",
+            description: "Disallow `Object` constructors",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-new-object"
         },

package/lib/rules/no-new-require.js

@@ -20,7 +20,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `new` operators with calls to `require`",
+            description: "Disallow `new` operators with calls to `require`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-new-require"
         },

package/lib/rules/no-new-symbol.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow `new` operators with the `Symbol` object",
+            description: "Disallow `new` operators with the `Symbol` object",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-new-symbol"
         },

package/lib/rules/no-new-wrappers.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `new` operators with the `String`, `Number`, and `Boolean` objects",
+            description: "Disallow `new` operators with the `String`, `Number`, and `Boolean` objects",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-new-wrappers"
         },

package/lib/rules/no-new.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `new` operators outside of assignments or comparisons",
+            description: "Disallow `new` operators outside of assignments or comparisons",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-new"
         },

package/lib/rules/no-nonoctal-decimal-escape.js

@@ -30,7 +30,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `\\8` and `\\9` escape sequences in string literals",
+            description: "Disallow `\\8` and `\\9` escape sequences in string literals",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-nonoctal-decimal-escape"
         },

package/lib/rules/no-obj-calls.js

@@ -43,7 +43,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow calling global object properties as functions",
+            description: "Disallow calling global object properties as functions",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-obj-calls"
         },

package/lib/rules/no-octal-escape.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow octal escape sequences in string literals",
+            description: "Disallow octal escape sequences in string literals",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-octal-escape"
         },

package/lib/rules/no-octal.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow octal literals",
+            description: "Disallow octal literals",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-octal"
         },

package/lib/rules/no-param-reassign.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow reassigning `function` parameters",
+            description: "Disallow reassigning `function` parameters",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-param-reassign"
         },

package/lib/rules/no-path-concat.js

@@ -19,7 +19,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow string concatenation with `__dirname` and `__filename`",
+            description: "Disallow string concatenation with `__dirname` and `__filename`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-path-concat"
         },

package/lib/rules/no-plusplus.js

@@ -51,7 +51,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow the unary operators `++` and `--`",
+            description: "Disallow the unary operators `++` and `--`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-plusplus"
         },

package/lib/rules/no-process-env.js

@@ -19,7 +19,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow the use of `process.env`",
+            description: "Disallow the use of `process.env`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-process-env"
         },

package/lib/rules/no-process-exit.js

@@ -19,7 +19,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow the use of `process.exit()`",
+            description: "Disallow the use of `process.exit()`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-process-exit"
         },

package/lib/rules/no-promise-executor-return.js

@@ -69,7 +69,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow returning values from Promise executor functions",
+            description: "Disallow returning values from Promise executor functions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-promise-executor-return"
         },

package/lib/rules/no-proto.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow the use of the `__proto__` property",
+            description: "Disallow the use of the `__proto__` property",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-proto"
         },

package/lib/rules/no-prototype-builtins.js

@@ -20,7 +20,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow calling some `Object.prototype` methods directly on objects",
+            description: "Disallow calling some `Object.prototype` methods directly on objects",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-prototype-builtins"
         },

package/lib/rules/no-redeclare.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow variable redeclaration",
+            description: "Disallow variable redeclaration",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-redeclare"
         },

package/lib/rules/no-regex-spaces.js

@@ -39,7 +39,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow multiple spaces in regular expressions",
+            description: "Disallow multiple spaces in regular expressions",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-regex-spaces"
         },

package/lib/rules/no-restricted-exports.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow specified names in exports",
+            description: "Disallow specified names in exports",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-exports"
         },

package/lib/rules/no-restricted-globals.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow specified global variables",
+            description: "Disallow specified global variables",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-globals"
         },

package/lib/rules/no-restricted-imports.js

@@ -58,6 +58,14 @@ const arrayOfStringsOrObjectPatterns = {
             items: {
                 type: "object",
                 properties: {
+                    importNames: {
+                        type: "array",
+                        items: {
+                            type: "string"
+                        },
+                        minItems: 1,
+                        uniqueItems: true
+                    },
                     group: {
                         type: "array",
                         items: {
@@ -88,7 +96,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow specified modules when loaded by `import`",
+            description: "Disallow specified modules when loaded by `import`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-imports"
         },
@@ -102,6 +110,14 @@ module.exports = {
             // eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
             patternWithCustomMessage: "'{{importSource}}' import is restricted from being used by a pattern. {{customMessage}}",
 
+            patternAndImportName: "'{{importName}}' import from '{{importSource}}' is restricted from being used by a pattern.",
+            // eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
+            patternAndImportNameWithCustomMessage: "'{{importName}}' import from '{{importSource}}' is restricted from being used by a pattern. {{customMessage}}",
+
+            patternAndEverything: "* import is invalid because '{{importNames}}' from '{{importSource}}' is restricted from being used by a pattern.",
+            // eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
+            patternAndEverythingWithCustomMessage: "* import is invalid because '{{importNames}}' from '{{importSource}}' is restricted from being used by a pattern. {{customMessage}}",
+
             everything: "* import is invalid because '{{importNames}}' from '{{importSource}}' is restricted.",
             // eslint-disable-next-line eslint-plugin/report-message-format -- Custom message might not end in a period
             everythingWithCustomMessage: "* import is invalid because '{{importNames}}' from '{{importSource}}' is restricted. {{customMessage}}",
@@ -159,9 +175,10 @@ module.exports = {
         }
 
         // relative paths are supported for this rule
-        const restrictedPatternGroups = restrictedPatterns.map(({ group, message, caseSensitive }) => ({
+        const restrictedPatternGroups = restrictedPatterns.map(({ group, message, caseSensitive, importNames }) => ({
             matcher: ignore({ allowRelativePaths: true, ignorecase: !caseSensitive }).add(group),
-            customMessage: message
+            customMessage: message,
+            importNames
         }));
 
         // if no imports are restricted we don't need to check
@@ -234,20 +251,68 @@ module.exports = {
         /**
          * Report a restricted path specifically for patterns.
          * @param {node} node representing the restricted path reference
-         * @param {Object} group contains a Ignore instance for paths, and the customMessage to show if it fails
+         * @param {Object} group contains an Ignore instance for paths, the customMessage to show on failure,
+         * and any restricted import names that have been specified in the config
+         * @param {Map<string,Object[]>} importNames Map of import names that are being imported
          * @returns {void}
          * @private
          */
-        function reportPathForPatterns(node, group) {
+        function reportPathForPatterns(node, group, importNames) {
             const importSource = node.source.value.trim();
 
-            context.report({
-                node,
-                messageId: group.customMessage ? "patternWithCustomMessage" : "patterns",
-                data: {
-                    importSource,
-                    customMessage: group.customMessage
+            const customMessage = group.customMessage;
+            const restrictedImportNames = group.importNames;
+
+            /*
+             * If we are not restricting to any specific import names and just the pattern itself,
+             * report the error and move on
+             */
+            if (!restrictedImportNames) {
+                context.report({
+                    node,
+                    messageId: customMessage ? "patternWithCustomMessage" : "patterns",
+                    data: {
+                        importSource,
+                        customMessage
+                    }
+                });
+                return;
+            }
+
+            if (importNames.has("*")) {
+                const specifierData = importNames.get("*")[0];
+
+                context.report({
+                    node,
+                    messageId: customMessage ? "patternAndEverythingWithCustomMessage" : "patternAndEverything",
+                    loc: specifierData.loc,
+                    data: {
+                        importSource,
+                        importNames: restrictedImportNames,
+                        customMessage
+                    }
+                });
+            }
+
+            restrictedImportNames.forEach(importName => {
+                if (!importNames.has(importName)) {
+                    return;
                 }
+
+                const specifiers = importNames.get(importName);
+
+                specifiers.forEach(specifier => {
+                    context.report({
+                        node,
+                        messageId: customMessage ? "patternAndImportNameWithCustomMessage" : "patternAndImportName",
+                        loc: specifier.loc,
+                        data: {
+                            importSource,
+                            customMessage,
+                            importName
+                        }
+                    });
+                });
             });
         }
 
@@ -304,7 +369,7 @@ module.exports = {
             checkRestrictedPathAndReport(importSource, importNames, node);
             restrictedPatternGroups.forEach(group => {
                 if (isRestrictedPattern(importSource, group)) {
-                    reportPathForPatterns(node, group);
+                    reportPathForPatterns(node, group, importNames);
                 }
             });
         }

package/lib/rules/no-restricted-modules.js

@@ -49,7 +49,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow specified modules when loaded by `require`",
+            description: "Disallow specified modules when loaded by `require`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-modules"
         },

package/lib/rules/no-restricted-properties.js

@@ -17,7 +17,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow certain properties on certain objects",
+            description: "Disallow certain properties on certain objects",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-properties"
         },

package/lib/rules/no-restricted-syntax.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow specified syntax",
+            description: "Disallow specified syntax",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-restricted-syntax"
         },

package/lib/rules/no-return-assign.js

@@ -26,7 +26,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow assignment operators in `return` statements",
+            description: "Disallow assignment operators in `return` statements",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-return-assign"
         },

package/lib/rules/no-return-await.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary `return await`",
+            description: "Disallow unnecessary `return await`",
 
             recommended: false,
 

package/lib/rules/no-script-url.js

@@ -18,7 +18,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow `javascript:` urls",
+            description: "Disallow `javascript:` urls",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-script-url"
         },

package/lib/rules/no-self-assign.js

@@ -130,7 +130,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow assignments where both sides are exactly the same",
+            description: "Disallow assignments where both sides are exactly the same",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-self-assign"
         },

package/lib/rules/no-self-compare.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow comparisons where both sides are exactly the same",
+            description: "Disallow comparisons where both sides are exactly the same",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-self-compare"
         },

package/lib/rules/no-sequences.js

@@ -29,7 +29,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow comma operators",
+            description: "Disallow comma operators",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-sequences"
         },

package/lib/rules/no-setter-return.js

@@ -142,7 +142,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow returning values from setters",
+            description: "Disallow returning values from setters",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-setter-return"
         },

package/lib/rules/no-shadow-restricted-names.js

@@ -27,7 +27,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow identifiers from shadowing restricted names",
+            description: "Disallow identifiers from shadowing restricted names",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-shadow-restricted-names"
         },

package/lib/rules/no-shadow.js

@@ -30,7 +30,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow variable declarations from shadowing variables declared in the outer scope",
+            description: "Disallow variable declarations from shadowing variables declared in the outer scope",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-shadow"
         },

package/lib/rules/no-spaced-func.js

@@ -16,7 +16,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow spacing between function identifiers and their applications (deprecated)",
+            description: "Disallow spacing between function identifiers and their applications (deprecated)",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-spaced-func"
         },

package/lib/rules/no-sparse-arrays.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow sparse arrays",
+            description: "Disallow sparse arrays",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-sparse-arrays"
         },

package/lib/rules/no-sync.js

@@ -20,7 +20,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow synchronous methods",
+            description: "Disallow synchronous methods",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-sync"
         },

package/lib/rules/no-tabs.js

@@ -22,7 +22,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow all tabs",
+            description: "Disallow all tabs",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-tabs"
         },