eslint 8.18.0 → 8.19.0

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"
         },

package/lib/rules/no-template-curly-in-string.js

@@ -14,7 +14,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow template literal placeholder syntax in regular strings",
+            description: "Disallow template literal placeholder syntax in regular strings",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-template-curly-in-string"
         },

package/lib/rules/no-ternary.js

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

package/lib/rules/no-this-before-super.js

@@ -40,7 +40,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow `this`/`super` before calling `super()` in constructors",
+            description: "Disallow `this`/`super` before calling `super()` in constructors",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-this-before-super"
         },

package/lib/rules/no-throw-literal.js

@@ -17,7 +17,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow throwing literals as exceptions",
+            description: "Disallow throwing literals as exceptions",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-throw-literal"
         },

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

@@ -20,7 +20,7 @@ module.exports = {
         type: "layout",
 
         docs: {
-            description: "disallow trailing whitespace at the end of lines",
+            description: "Disallow trailing whitespace at the end of lines",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-trailing-spaces"
         },

package/lib/rules/no-undef-init.js

@@ -17,7 +17,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow initializing variables to `undefined`",
+            description: "Disallow initializing variables to `undefined`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-undef-init"
         },

package/lib/rules/no-undef.js

@@ -29,7 +29,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow the use of undeclared variables unless mentioned in `/*global */` comments",
+            description: "Disallow the use of undeclared variables unless mentioned in `/*global */` comments",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-undef"
         },

package/lib/rules/no-undefined.js

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

package/lib/rules/no-underscore-dangle.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow dangling underscores in identifiers",
+            description: "Disallow dangling underscores in identifiers",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-underscore-dangle"
         },

package/lib/rules/no-unexpected-multiline.js

@@ -20,7 +20,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow confusing multiline expressions",
+            description: "Disallow confusing multiline expressions",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-unexpected-multiline"
         },

package/lib/rules/no-unmodified-loop-condition.js

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

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

@@ -29,7 +29,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow ternary operators when simpler alternatives exist",
+            description: "Disallow ternary operators when simpler alternatives exist",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-unneeded-ternary"
         },

package/lib/rules/no-unreachable-loop.js

@@ -59,7 +59,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow loops with a body that allows only one iteration",
+            description: "Disallow loops with a body that allows only one iteration",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-unreachable-loop"
         },

package/lib/rules/no-unreachable.js

@@ -111,7 +111,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow unreachable code after `return`, `throw`, `continue`, and `break` statements",
+            description: "Disallow unreachable code after `return`, `throw`, `continue`, and `break` statements",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-unreachable"
         },

package/lib/rules/no-unsafe-finally.js

@@ -24,7 +24,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow control flow statements in `finally` blocks",
+            description: "Disallow control flow statements in `finally` blocks",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-unsafe-finally"
         },

package/lib/rules/no-unsafe-negation.js

@@ -52,7 +52,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow negating the left operand of relational operators",
+            description: "Disallow negating the left operand of relational operators",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-unsafe-negation"
         },

package/lib/rules/no-unsafe-optional-chaining.js

@@ -24,7 +24,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow use of optional chaining in contexts where the `undefined` value is not allowed",
+            description: "Disallow use of optional chaining in contexts where the `undefined` value is not allowed",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-unsafe-optional-chaining"
         },

package/lib/rules/no-unused-expressions.js

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

package/lib/rules/no-unused-labels.js

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

package/lib/rules/no-unused-private-class-members.js

@@ -15,7 +15,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow unused private class members",
+            description: "Disallow unused private class members",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-unused-private-class-members"
         },

package/lib/rules/no-unused-vars.js

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

package/lib/rules/no-use-before-define.js

@@ -226,7 +226,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow the use of variables before they are defined",
+            description: "Disallow the use of variables before they are defined",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-use-before-define"
         },

package/lib/rules/no-useless-backreference.js

@@ -64,7 +64,7 @@ module.exports = {
         type: "problem",
 
         docs: {
-            description: "disallow useless backreferences in regular expressions",
+            description: "Disallow useless backreferences in regular expressions",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-useless-backreference"
         },

package/lib/rules/no-useless-call.js

@@ -55,7 +55,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary calls to `.call()` and `.apply()`",
+            description: "Disallow unnecessary calls to `.call()` and `.apply()`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-call"
         },

package/lib/rules/no-useless-catch.js

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

package/lib/rules/no-useless-computed-key.js

@@ -91,7 +91,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary computed property keys in objects and classes",
+            description: "Disallow unnecessary computed property keys in objects and classes",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-computed-key"
         },

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

@@ -70,7 +70,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary concatenation of literals or template literals",
+            description: "Disallow unnecessary concatenation of literals or template literals",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-concat"
         },

package/lib/rules/no-useless-constructor.js

@@ -138,7 +138,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary constructors",
+            description: "Disallow unnecessary constructors",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-constructor"
         },

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

@@ -84,7 +84,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow unnecessary escape characters",
+            description: "Disallow unnecessary escape characters",
             recommended: true,
             url: "https://eslint.org/docs/rules/no-useless-escape"
         },

package/lib/rules/no-useless-rename.js

@@ -21,7 +21,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow renaming import, export, and destructured assignments to the same name",
+            description: "Disallow renaming import, export, and destructured assignments to the same name",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-rename"
         },

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

@@ -67,7 +67,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "disallow redundant return statements",
+            description: "Disallow redundant return statements",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-useless-return"
         },

package/lib/rules/no-var.js

@@ -185,7 +185,7 @@ module.exports = {
         type: "suggestion",
 
         docs: {
-            description: "require `let` or `const` instead of `var`",
+            description: "Require `let` or `const` instead of `var`",
             recommended: false,
             url: "https://eslint.org/docs/rules/no-var"
         },