eslint 9.9.1 → 9.11.0

package/lib/linter/linter.js

@@ -17,9 +17,6 @@ const
     espree = require("espree"),
     merge = require("lodash.merge"),
     pkg = require("../../package.json"),
-    {
-        directivesPattern
-    } = require("../shared/directives"),
     {
         Legacy: {
             ConfigOps,
@@ -30,7 +27,7 @@ const
     Traverser = require("../shared/traverser"),
     { SourceCode } = require("../languages/js/source-code"),
     applyDisableDirectives = require("./apply-disable-directives"),
-    ConfigCommentParser = require("./config-comment-parser"),
+    { ConfigCommentParser } = require("@eslint/plugin-kit"),
     NodeEventGenerator = require("./node-event-generator"),
     createReportTranslator = require("./report-translator"),
     Rules = require("./rules"),
@@ -56,6 +53,8 @@ const parserSymbol = Symbol.for("eslint.RuleTester.parser");
 const { LATEST_ECMA_VERSION } = require("../../conf/ecma-version");
 const { VFile } = require("./vfile");
 const { ParserService } = require("../services/parser-service");
+const { FileContext } = require("./file-context");
+const { ProcessorService } = require("../services/processor-service");
 const STEP_KIND_VISIT = 1;
 const STEP_KIND_CALL = 2;
 
@@ -334,7 +333,7 @@ function createDisableDirectives({ type, value, justification, node }, ruleMappe
         directives: [], // valid disable directives
         directiveProblems: [] // problems in directives
     };
-    const parentDirective = { node, ruleIds };
+    const parentDirective = { node, value, ruleIds };
 
     for (const ruleId of directiveRules) {
 
@@ -402,15 +401,20 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
     });
 
     sourceCode.getInlineConfigNodes().filter(token => token.type !== "Shebang").forEach(comment => {
-        const { directivePart, justificationPart } = commentParser.extractDirectiveComment(comment.value);
 
-        const match = directivesPattern.exec(directivePart);
+        const directive = commentParser.parseDirective(comment.value);
 
-        if (!match) {
+        if (!directive) {
             return;
         }
-        const directiveText = match[1];
-        const lineCommentSupported = /^eslint-disable-(next-)?line$/u.test(directiveText);
+
+        const {
+            label,
+            value,
+            justification: justificationPart
+        } = directive;
+
+        const lineCommentSupported = /^eslint-disable-(next-)?line$/u.test(label);
 
         if (comment.type === "Line" && !lineCommentSupported) {
             return;
@@ -419,7 +423,7 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
         const loc = sourceCode.getLoc(comment);
 
         if (warnInlineConfig) {
-            const kind = comment.type === "Block" ? `/*${directiveText}*/` : `//${directiveText}`;
+            const kind = comment.type === "Block" ? `/*${label}*/` : `//${label}`;
 
             problems.push(createLintingProblem({
                 ruleId: null,
@@ -430,8 +434,8 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
             return;
         }
 
-        if (directiveText === "eslint-disable-line" && loc.start.line !== loc.end.line) {
-            const message = `${directiveText} comment should not span multiple lines.`;
+        if (label === "eslint-disable-line" && loc.start.line !== loc.end.line) {
+            const message = `${label} comment should not span multiple lines.`;
 
             problems.push(createLintingProblem({
                 ruleId: null,
@@ -441,17 +445,15 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
             return;
         }
 
-        const directiveValue = directivePart.slice(match.index + directiveText.length);
-
-        switch (directiveText) {
+        switch (label) {
             case "eslint-disable":
             case "eslint-enable":
             case "eslint-disable-next-line":
             case "eslint-disable-line": {
-                const directiveType = directiveText.slice("eslint-".length);
+                const directiveType = label.slice("eslint-".length);
                 const { directives, directiveProblems } = createDisableDirectives({
                     type: directiveType,
-                    value: directiveValue,
+                    value,
                     justification: justificationPart,
                     node: comment
                 }, ruleMapper, jslang, sourceCode);
@@ -462,16 +464,16 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
             }
 
             case "exported":
-                Object.assign(exportedVariables, commentParser.parseListConfig(directiveValue, comment));
+                Object.assign(exportedVariables, commentParser.parseListConfig(value));
                 break;
 
             case "globals":
             case "global":
-                for (const [id, { value }] of Object.entries(commentParser.parseStringConfig(directiveValue, comment))) {
+                for (const [id, idSetting] of Object.entries(commentParser.parseStringConfig(value))) {
                     let normalizedValue;
 
                     try {
-                        normalizedValue = ConfigOps.normalizeConfigGlobal(value);
+                        normalizedValue = ConfigOps.normalizeConfigGlobal(idSetting);
                     } catch (err) {
                         problems.push(createLintingProblem({
                             ruleId: null,
@@ -494,9 +496,9 @@ function getDirectiveComments(sourceCode, ruleMapper, warnInlineConfig, config)
                 break;
 
             case "eslint": {
-                const parseResult = commentParser.parseJsonConfig(directiveValue);
+                const parseResult = commentParser.parseJSONLikeConfig(value);
 
-                if (parseResult.success) {
+                if (parseResult.ok) {
                     Object.keys(parseResult.config).forEach(name => {
                         const rule = ruleMapper(name);
                         const ruleValue = parseResult.config[name];
@@ -713,7 +715,7 @@ function findEslintEnv(text) {
         if (match[0].endsWith("*/")) {
             retv = Object.assign(
                 retv || {},
-                commentParser.parseListConfig(commentParser.extractDirectiveComment(match[1]).directivePart)
+                commentParser.parseListConfig(commentParser.parseDirective(match[0].slice(2, -2)).value)
             );
         }
     }
@@ -979,24 +981,18 @@ function runRules(
      * All rule contexts will inherit from this object. This avoids the performance penalty of copying all the
      * properties once for each rule.
      */
-    const sharedTraversalContext = Object.freeze(
-        {
-            getCwd: () => cwd,
-            cwd,
-            getFilename: () => filename,
-            filename,
-            getPhysicalFilename: () => physicalFilename || filename,
-            physicalFilename: physicalFilename || filename,
-            getSourceCode: () => sourceCode,
-            sourceCode,
-            parserOptions: {
-                ...languageOptions.parserOptions
-            },
-            parserPath: parserName,
-            languageOptions,
-            settings
-        }
-    );
+    const sharedTraversalContext = new FileContext({
+        cwd,
+        filename,
+        physicalFilename: physicalFilename || filename,
+        sourceCode,
+        parserOptions: {
+            ...languageOptions.parserOptions
+        },
+        parserPath: parserName,
+        languageOptions,
+        settings
+    });
 
     const lintingProblems = [];
 
@@ -1297,27 +1293,18 @@ class Linter {
     }
 
     /**
-     * Same as linter.verify, except without support for processors.
-     * @param {string|SourceCode} textOrSourceCode The text to parse or a SourceCode object.
+     * Lint using eslintrc and without processors.
+     * @param {VFile} file The file to lint.
      * @param {ConfigData} providedConfig An ESLintConfig instance to configure everything.
      * @param {VerifyOptions} [providedOptions] The optional filename of the file being checked.
      * @throws {Error} If during rule execution.
      * @returns {(LintMessage|SuppressedLintMessage)[]} The results as an array of messages or an empty array if no messages.
      */
-    _verifyWithoutProcessors(textOrSourceCode, providedConfig, providedOptions) {
+    #eslintrcVerifyWithoutProcessors(file, providedConfig, providedOptions) {
+
         const slots = internalSlotsMap.get(this);
         const config = providedConfig || {};
         const options = normalizeVerifyOptions(providedOptions, config);
-        let text;
-
-        // evaluate arguments
-        if (typeof textOrSourceCode === "string") {
-            slots.lastSourceCode = null;
-            text = textOrSourceCode;
-        } else {
-            slots.lastSourceCode = textOrSourceCode;
-            text = textOrSourceCode.text;
-        }
 
         // Resolve parser.
         let parserName = DEFAULT_PARSER_NAME;
@@ -1344,7 +1331,7 @@ class Linter {
 
         // search and apply "eslint-env *".
         const envInFile = options.allowInlineConfig && !options.warnInlineConfig
-            ? findEslintEnv(text)
+            ? findEslintEnv(file.body)
             : {};
         const resolvedEnvConfig = Object.assign({ builtin: true }, config.env, envInFile);
         const enabledEnvs = Object.keys(resolvedEnvConfig)
@@ -1360,9 +1347,6 @@ class Linter {
             parser,
             parserOptions
         });
-        const file = new VFile(options.filename, text, {
-            physicalPath: providedOptions.physicalFilename
-        });
 
         if (!slots.lastSourceCode) {
             let t;
@@ -1473,6 +1457,36 @@ class Linter {
                 .sort((problemA, problemB) => problemA.line - problemB.line || problemA.column - problemB.column),
             reportUnusedDisableDirectives: options.reportUnusedDisableDirectives
         });
+
+    }
+
+    /**
+     * Same as linter.verify, except without support for processors.
+     * @param {string|SourceCode} textOrSourceCode The text to parse or a SourceCode object.
+     * @param {ConfigData} providedConfig An ESLintConfig instance to configure everything.
+     * @param {VerifyOptions} [providedOptions] The optional filename of the file being checked.
+     * @throws {Error} If during rule execution.
+     * @returns {(LintMessage|SuppressedLintMessage)[]} The results as an array of messages or an empty array if no messages.
+     */
+    _verifyWithoutProcessors(textOrSourceCode, providedConfig, providedOptions) {
+        const slots = internalSlotsMap.get(this);
+        const filename = normalizeFilename(providedOptions.filename || "<input>");
+        let text;
+
+        // evaluate arguments
+        if (typeof textOrSourceCode === "string") {
+            slots.lastSourceCode = null;
+            text = textOrSourceCode;
+        } else {
+            slots.lastSourceCode = textOrSourceCode;
+            text = textOrSourceCode.text;
+        }
+
+        const file = new VFile(filename, text, {
+            physicalPath: providedOptions.physicalFilename
+        });
+
+        return this.#eslintrcVerifyWithoutProcessors(file, providedConfig, providedOptions);
     }
 
     /**
@@ -1542,102 +1556,91 @@ class Linter {
      * @returns {(LintMessage|SuppressedLintMessage)[]} The found problems.
      */
     _verifyWithFlatConfigArrayAndProcessor(textOrSourceCode, config, options, configForRecursive) {
+        const slots = internalSlotsMap.get(this);
         const filename = options.filename || "<input>";
         const filenameToExpose = normalizeFilename(filename);
         const physicalFilename = options.physicalFilename || filenameToExpose;
         const text = ensureText(textOrSourceCode);
+        const file = new VFile(filenameToExpose, text, {
+            physicalPath: physicalFilename
+        });
+
         const preprocess = options.preprocess || (rawText => [rawText]);
         const postprocess = options.postprocess || (messagesList => messagesList.flat());
+
+        const processorService = new ProcessorService();
+        const preprocessResult = processorService.preprocessSync(file, {
+            processor: {
+                preprocess,
+                postprocess
+            }
+        });
+
+        if (!preprocessResult.ok) {
+            return preprocessResult.errors;
+        }
+
         const filterCodeBlock =
             options.filterCodeBlock ||
             (blockFilename => blockFilename.endsWith(".js"));
         const originalExtname = path.extname(filename);
+        const { files } = preprocessResult;
 
-        let blocks;
-
-        try {
-            blocks = preprocess(text, filenameToExpose);
-        } catch (ex) {
-
-            // If the message includes a leading line number, strip it:
-            const message = `Preprocessing error: ${ex.message.replace(/^line \d+:/iu, "").trim()}`;
-
-            debug("%s\n%s", message, ex.stack);
-
-            return [
-                {
-                    ruleId: null,
-                    fatal: true,
-                    severity: 2,
-                    message,
-                    line: ex.lineNumber,
-                    column: ex.column,
-                    nodeType: null
-                }
-            ];
-        }
-
-        const messageLists = blocks.map((block, i) => {
-            debug("A code block was found: %o", block.filename || "(unnamed)");
+        const messageLists = files.map(block => {
+            debug("A code block was found: %o", block.path || "(unnamed)");
 
             // Keep the legacy behavior.
             if (typeof block === "string") {
                 return this._verifyWithFlatConfigArrayAndWithoutProcessors(block, config, options);
             }
 
-            const blockText = block.text;
-            const blockName = path.join(filename, `${i}_${block.filename}`);
-
             // Skip this block if filtered.
-            if (!filterCodeBlock(blockName, blockText)) {
+            if (!filterCodeBlock(block.path, block.body)) {
                 debug("This code block was skipped.");
                 return [];
             }
 
             // Resolve configuration again if the file content or extension was changed.
-            if (configForRecursive && (text !== blockText || path.extname(blockName) !== originalExtname)) {
+            if (configForRecursive && (text !== block.rawBody || path.extname(block.path) !== originalExtname)) {
                 debug("Resolving configuration again because the file content or extension was changed.");
                 return this._verifyWithFlatConfigArray(
-                    blockText,
+                    block.rawBody,
                     configForRecursive,
-                    { ...options, filename: blockName, physicalFilename }
+                    { ...options, filename: block.path, physicalFilename: block.physicalPath }
                 );
             }
 
+            slots.lastSourceCode = null;
+
             // Does lint.
-            return this._verifyWithFlatConfigArrayAndWithoutProcessors(
-                blockText,
+            return this.#flatVerifyWithoutProcessors(
+                block,
                 config,
-                { ...options, filename: blockName, physicalFilename }
+                { ...options, filename: block.path, physicalFilename: block.physicalPath }
             );
         });
 
-        return postprocess(messageLists, filenameToExpose);
+        return processorService.postprocessSync(file, messageLists, {
+            processor: {
+                preprocess,
+                postprocess
+            }
+        });
     }
 
     /**
-     * Same as linter.verify, except without support for processors.
-     * @param {string|SourceCode} textOrSourceCode The text to parse or a SourceCode object.
+     * Verify using flat config and without any processors.
+     * @param {VFile} file The file to lint.
      * @param {FlatConfig} providedConfig An ESLintConfig instance to configure everything.
      * @param {VerifyOptions} [providedOptions] The optional filename of the file being checked.
      * @throws {Error} If during rule execution.
      * @returns {(LintMessage|SuppressedLintMessage)[]} The results as an array of messages or an empty array if no messages.
      */
-    _verifyWithFlatConfigArrayAndWithoutProcessors(textOrSourceCode, providedConfig, providedOptions) {
+    #flatVerifyWithoutProcessors(file, providedConfig, providedOptions) {
+
         const slots = internalSlotsMap.get(this);
         const config = providedConfig || {};
         const options = normalizeVerifyOptions(providedOptions, config);
-        let text;
-
-        // evaluate arguments
-        if (typeof textOrSourceCode === "string") {
-            slots.lastSourceCode = null;
-            text = textOrSourceCode;
-        } else {
-            slots.lastSourceCode = textOrSourceCode;
-            text = textOrSourceCode.text;
-        }
-
         const languageOptions = config.languageOptions;
 
         languageOptions.ecmaVersion = normalizeEcmaVersionForLanguageOptions(
@@ -1668,9 +1671,6 @@ class Linter {
         }
 
         const settings = config.settings || {};
-        const file = new VFile(options.filename, text, {
-            physicalPath: providedOptions.physicalFilename
-        });
 
         if (!slots.lastSourceCode) {
             let t;
@@ -1962,6 +1962,37 @@ class Linter {
             ruleFilter: options.ruleFilter,
             configuredRules
         });
+
+
+    }
+
+    /**
+     * Same as linter.verify, except without support for processors.
+     * @param {string|SourceCode} textOrSourceCode The text to parse or a SourceCode object.
+     * @param {FlatConfig} providedConfig An ESLintConfig instance to configure everything.
+     * @param {VerifyOptions} [providedOptions] The optional filename of the file being checked.
+     * @throws {Error} If during rule execution.
+     * @returns {(LintMessage|SuppressedLintMessage)[]} The results as an array of messages or an empty array if no messages.
+     */
+    _verifyWithFlatConfigArrayAndWithoutProcessors(textOrSourceCode, providedConfig, providedOptions) {
+        const slots = internalSlotsMap.get(this);
+        const filename = normalizeFilename(providedOptions.filename || "<input>");
+        let text;
+
+        // evaluate arguments
+        if (typeof textOrSourceCode === "string") {
+            slots.lastSourceCode = null;
+            text = textOrSourceCode;
+        } else {
+            slots.lastSourceCode = textOrSourceCode;
+            text = textOrSourceCode.text;
+        }
+
+        const file = new VFile(filename, text, {
+            physicalPath: providedOptions.physicalFilename
+        });
+
+        return this.#flatVerifyWithoutProcessors(file, providedConfig, providedOptions);
     }
 
     /**
@@ -2062,77 +2093,78 @@ class Linter {
      * @returns {(LintMessage|SuppressedLintMessage)[]} The found problems.
      */
     _verifyWithProcessor(textOrSourceCode, config, options, configForRecursive) {
+        const slots = internalSlotsMap.get(this);
         const filename = options.filename || "<input>";
         const filenameToExpose = normalizeFilename(filename);
         const physicalFilename = options.physicalFilename || filenameToExpose;
         const text = ensureText(textOrSourceCode);
+        const file = new VFile(filenameToExpose, text, {
+            physicalPath: physicalFilename
+        });
+
         const preprocess = options.preprocess || (rawText => [rawText]);
         const postprocess = options.postprocess || (messagesList => messagesList.flat());
-        const filterCodeBlock =
-            options.filterCodeBlock ||
-            (blockFilename => blockFilename.endsWith(".js"));
-        const originalExtname = path.extname(filename);
-
-        let blocks;
 
-        try {
-            blocks = preprocess(text, filenameToExpose);
-        } catch (ex) {
+        const processorService = new ProcessorService();
+        const preprocessResult = processorService.preprocessSync(file, {
+            processor: {
+                preprocess,
+                postprocess
+            }
+        });
 
-            // If the message includes a leading line number, strip it:
-            const message = `Preprocessing error: ${ex.message.replace(/^line \d+:/iu, "").trim()}`;
+        if (!preprocessResult.ok) {
+            return preprocessResult.errors;
+        }
 
-            debug("%s\n%s", message, ex.stack);
+        const filterCodeBlock =
+            options.filterCodeBlock ||
+            (blockFilePath => blockFilePath.endsWith(".js"));
+        const originalExtname = path.extname(filename);
 
-            return [
-                {
-                    ruleId: null,
-                    fatal: true,
-                    severity: 2,
-                    message,
-                    line: ex.lineNumber,
-                    column: ex.column,
-                    nodeType: null
-                }
-            ];
-        }
+        const { files } = preprocessResult;
 
-        const messageLists = blocks.map((block, i) => {
-            debug("A code block was found: %o", block.filename || "(unnamed)");
+        const messageLists = files.map(block => {
+            debug("A code block was found: %o", block.path ?? "(unnamed)");
 
             // Keep the legacy behavior.
             if (typeof block === "string") {
                 return this._verifyWithoutProcessors(block, config, options);
             }
 
-            const blockText = block.text;
-            const blockName = path.join(filename, `${i}_${block.filename}`);
-
             // Skip this block if filtered.
-            if (!filterCodeBlock(blockName, blockText)) {
+            if (!filterCodeBlock(block.path, block.body)) {
                 debug("This code block was skipped.");
                 return [];
             }
 
             // Resolve configuration again if the file content or extension was changed.
-            if (configForRecursive && (text !== blockText || path.extname(blockName) !== originalExtname)) {
+            if (configForRecursive && (text !== block.rawBody || path.extname(block.path) !== originalExtname)) {
                 debug("Resolving configuration again because the file content or extension was changed.");
                 return this._verifyWithConfigArray(
-                    blockText,
+                    block.rawBody,
                     configForRecursive,
-                    { ...options, filename: blockName, physicalFilename }
+                    { ...options, filename: block.path, physicalFilename: block.physicalPath }
                 );
             }
 
+            slots.lastSourceCode = null;
+
             // Does lint.
-            return this._verifyWithoutProcessors(
-                blockText,
+            return this.#eslintrcVerifyWithoutProcessors(
+                block,
                 config,
-                { ...options, filename: blockName, physicalFilename }
+                { ...options, filename: block.path, physicalFilename: block.physicalPath }
             );
         });
 
-        return postprocess(messageLists, filenameToExpose);
+        return processorService.postprocessSync(file, messageLists, {
+            processor: {
+                preprocess,
+                postprocess
+            }
+        });
+
     }
 
     /**

package/lib/linter/vfile.js

@@ -85,6 +85,13 @@ class VFile {
      */
     body;
 
+    /**
+     * The raw body of the file, including a BOM if present.
+     * @type {string|Uint8Array}
+     * @readonly
+     */
+    rawBody;
+
     /**
      * Indicates whether the file has a byte order mark (BOM).
      * @type {boolean}
@@ -104,8 +111,8 @@ class VFile {
         this.physicalPath = physicalPath ?? path;
         this.bom = hasUnicodeBOM(body);
         this.body = stripUnicodeBOM(body);
+        this.rawBody = body;
     }
-
 }
 
 module.exports = { VFile };

package/lib/rules/id-length.js

@@ -11,6 +11,7 @@
 //------------------------------------------------------------------------------
 
 const { getGraphemeCount } = require("../shared/string-utils");
+const { getModuleExportName } = require("./utils/ast-utils");
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -116,7 +117,14 @@ module.exports = {
                 }
                 return properties && !parent.computed && parent.key.name === node.name;
             },
+            ImportSpecifier(parent, node) {
+                return (
+                    parent.local === node &&
+                    getModuleExportName(parent.imported) !== getModuleExportName(parent.local)
+                );
+            },
             ImportDefaultSpecifier: true,
+            ImportNamespaceSpecifier: true,
             RestElement: true,
             FunctionExpression: true,
             ArrowFunctionExpression: true,