New: support specifying extensions in the config (fixes #10828)

conf/config-schema.js

@@ -8,6 +8,7 @@
 const baseConfigProperties = {
     env: { type: "object" },
     extends: { $ref: "#/definitions/stringOrStrings" },
+    extensions: { type: "array", items: "string" },
     globals: { type: "object" },
     overrides: {
         type: "array",

lib/cli-engine/cli-engine.js

@@ -789,7 +789,7 @@ class CLIEngine {
                 fix,
                 allowInlineConfig,
                 reportUnusedDisableDirectives,
-                extensionRegExp: fileEnumerator.extensionRegExp,
+                extensionRegExp: fileEnumerator.getExtensionRegExp(config, filePath),
                 linter
             });
 
@@ -878,7 +878,10 @@ class CLIEngine {
                 fix,
                 allowInlineConfig,
                 reportUnusedDisableDirectives,
-                extensionRegExp: fileEnumerator.extensionRegExp,
+                extensionRegExp: fileEnumerator.getExtensionRegExp(
+                    config,
+                    resolvedFilename || path.join(cwd, "__placeholder__.js")
+                ),
                 linter
             }));
         }

lib/cli-engine/config-array-factory.js

@@ -525,6 +525,7 @@ class ConfigArrayFactory {
         {
             env,
             extends: extend,
+            extensions,
             globals,
             noInlineConfig,
             parser: parserName,
@@ -568,6 +569,7 @@ class ConfigArrayFactory {
             // Config data.
             criteria: null,
             env,
+            extensions,
             globals,
             noInlineConfig,
             parser,

lib/cli-engine/config-array/config-array.js

@@ -53,6 +53,7 @@ const { ExtractedConfig } = require("./extracted-config");
  * @property {string} filePath The path to the source file of this config element.
  * @property {InstanceType<OverrideTester>|null} criteria The tester for the `files` and `excludedFiles` of this config element.
  * @property {Record<string, boolean>|undefined} env The environment settings.
+ * @property {string[]|undefined} extensions The extensions to match files for directory patterns.
  * @property {Record<string, GlobalConf>|undefined} globals The global variable settings.
  * @property {boolean|undefined} noInlineConfig The flag that disables directive comments.
  * @property {DependentParser|undefined} parser The parser loader.
@@ -262,6 +263,7 @@ function createConfig(instance, indices) {
 
         // Merge others.
         mergeWithoutOverwrite(config.env, element.env);
+        config.extensions = config.extensions.concat(element.extensions || []);
         mergeWithoutOverwrite(config.globals, element.globals);
         mergeWithoutOverwrite(config.parserOptions, element.parserOptions);
         mergeWithoutOverwrite(config.settings, element.settings);

lib/cli-engine/config-array/extracted-config.js

@@ -41,6 +41,12 @@ class ExtractedConfig {
          */
         this.env = {};
 
+        /**
+         * Extensions to match files for directory patterns.
+         * @type {string[]}
+         */
+        this.extensions = [];
+
         /**
          * Global variables.
          * @type {Record<string, GlobalConf>}

lib/cli-engine/file-enumerator.js

@@ -89,7 +89,7 @@ const IGNORED = 2;
  * @typedef {Object} FileEnumeratorInternalSlots
  * @property {CascadingConfigArrayFactory} configArrayFactory The factory for config arrays.
  * @property {string} cwd The base directory to start lookup.
- * @property {RegExp} extensionRegExp The RegExp to test if a string ends with specific file extensions.
+ * @property {string[]} baseExtensions The array to check if a string ends with specific file extensions.
  * @property {boolean} globInputPaths Set to false to skip glob resolution of input file paths to lint (default: true). If false, each input file paths is assumed to be a non-glob path to an existing file.
  * @property {boolean} ignoreFlag The flag to check ignored files.
  * @property {IgnoredPaths} ignoredPathsWithDotfiles The ignored paths but don't include dot files.
@@ -198,17 +198,7 @@ class FileEnumerator {
         internalSlotsMap.set(this, {
             configArrayFactory,
             cwd,
-            extensionRegExp: new RegExp(
-                `.\\.(?:${extensions
-                    .map(ext => escapeRegExp(
-                        ext.startsWith(".")
-                            ? ext.slice(1)
-                            : ext
-                    ))
-                    .join("|")
-                })$`,
-                "u"
-            ),
+            baseExtensions: extensions,
             globInputPaths,
             ignoreFlag: ignore,
             ignoredPaths,
@@ -221,10 +211,27 @@ class FileEnumerator {
 
     /**
      * The `RegExp` object that tests if a file path has the allowed file extensions.
-     * @type {RegExp}
+     * @param {ConfigArray} [configArray] ESLint configuration.
+     * @param {string} [filePath] The absolute path to the target file.
+     * @returns {RegExp} The RegExp to test if a string ends with specific file extensions.
      */
-    get extensionRegExp() {
-        return internalSlotsMap.get(this).extensionRegExp;
+    getExtensionRegExp(configArray, filePath) {
+        let extensions = internalSlotsMap.get(this).baseExtensions;
+
+        if (configArray) {
+            const config = configArray.extractConfig(filePath);
+
+            extensions = extensions.concat(config.extensions || []);
+        }
+
+        // Use set to deduplicate.
+        const exts = new Set(
+            extensions
+                .filter(Boolean)
+                .map(ext => escapeRegExp(ext.startsWith(".") ? ext.slice(1) : ext))
+        );
+
+        return new RegExp(`.\\.${Array.from(exts).join("|")}$`, "u");
     }
 
     /**
@@ -386,7 +393,7 @@ class FileEnumerator {
             return;
         }
         debug(`Enter the directory: ${directoryPath}`);
-        const { configArrayFactory, extensionRegExp } = internalSlotsMap.get(this);
+        const { configArrayFactory } = internalSlotsMap.get(this);
 
         /** @type {ConfigArray|null} */
         let config = null;
@@ -401,6 +408,7 @@ class FileEnumerator {
                 if (!config) {
                     config = configArrayFactory.getConfigArrayForFile(filePath);
                 }
+                const extensionRegExp = this.getExtensionRegExp(config, filePath);
                 const ignored = this._isIgnoredFile(filePath, options);
                 const flag = ignored ? IGNORED_SILENTLY : NONE;
                 const matched = options.selector

lib/shared/types.js

@@ -29,6 +29,7 @@ module.exports = {};
  * @typedef {Object} ConfigData
  * @property {Record<string, boolean>} [env] The environment settings.
  * @property {string | string[]} [extends] The path to other config files or the package name of shareable configs.
+ * @property {string[]} [extensions] The array of filename extensions that should be checked for code.
  * @property {Record<string, GlobalConf>} [globals] The global variable settings.
  * @property {boolean} [noInlineConfig] The flag that disables directive comments.
  * @property {OverrideConfigData[]} [overrides] The override settings per kind of files.

tests/fixtures/configurations/extensions.json

@@ -0,0 +1,3 @@
+{
+    "extensions": ["ts"]
+}

tests/fixtures/extensions/extensions-js.js

@@ -0,0 +1 @@
+function fn() {}

tests/fixtures/extensions/extensions-ts.ts

@@ -0,0 +1 @@
+function fn() {}

tests/lib/cli-engine/cli-engine.js

@@ -633,7 +633,6 @@ describe("CLIEngine", () => {
             assert.strictEqual(report.results[0].source, "var foo = 'bar'");
         });
 
-
         it("should not return a `source` property when no errors or warnings are present", () => {
             engine = new CLIEngine({
                 useEslintrc: false,
@@ -753,6 +752,7 @@ describe("CLIEngine", () => {
                 assert.strictEqual(report.messages[0].message, "OK");
             });
         });
+
         it("should warn when deprecated rules are found in a config", () => {
             engine = new CLIEngine({
                 cwd: originalDir,
@@ -1157,6 +1157,30 @@ describe("CLIEngine", () => {
             assert.strictEqual(report.results[0].messages.length, 0);
         });
 
+        it("should process files with specifying extensions in configuration file", () => {
+
+            engine = new CLIEngine({
+                cwd: path.join(fixtureDir, "extensions"),
+                configFile: getFixturePath("configurations", "extensions.json")
+            });
+
+            let report = engine.executeOnFiles(["."]);
+
+            assert.lengthOf(report.results, 2);
+            assert.lengthOf(report.results[0].messages, 0);
+            assert.lengthOf(report.results[1].messages, 0);
+
+            engine = new CLIEngine({
+                cwd: path.join(fixtureDir, "extensions"),
+                configFile: getFixturePath("configurations", "es6.json")
+            });
+
+            report = engine.executeOnFiles(["."]);
+
+            assert.lengthOf(report.results, 1);
+            assert.lengthOf(report.results[0].messages, 0);
+        });
+
         it("should return zero messages when given a config with environment set to browser", () => {
 
             engine = new CLIEngine({

tests/lib/cli-engine/config-array-factory.js

@@ -29,6 +29,7 @@ function assertConfigArrayElement(actual, providedExpected) {
         filePath: "",
         criteria: null,
         env: void 0,
+        extensions: void 0,
         globals: void 0,
         noInlineConfig: void 0,
         parser: void 0,
@@ -54,6 +55,7 @@ function assertConfigArrayElement(actual, providedExpected) {
 function assertConfig(actual, providedExpected) {
     const expected = {
         env: {},
+        extensions: [],
         globals: {},
         noInlineConfig: void 0,
         parser: null,
@@ -461,6 +463,23 @@ describe("ConfigArrayFactory", () => {
                 });
             });
 
+            describe("if the config data had 'extensions' property, the returned value", () => {
+                const extensions = ["ts"];
+                let configArray;
+
+                beforeEach(() => {
+                    configArray = create({ extensions });
+                });
+
+                it("should have an element.", () => {
+                    assert.strictEqual(configArray.length, 1);
+                });
+
+                it("should have the 'extensions' value in the element.", () => {
+                    assertConfigArrayElement(configArray[0], { extensions });
+                });
+            });
+
             describe("if the config data had 'globals' property, the returned value", () => {
                 const globals = { window: "readonly" };
                 let configArray;

tests/lib/cli-engine/config-array/config-array.js

@@ -424,6 +424,7 @@ describe("ConfigArray", () => {
             assert.deepStrictEqual(result, {
                 configNameOfNoInlineConfig: "",
                 env: {},
+                extensions: [],
                 globals: {},
                 noInlineConfig: void 0,
                 parser: null,
@@ -456,6 +457,7 @@ describe("ConfigArray", () => {
             assert.deepStrictEqual(result, {
                 configNameOfNoInlineConfig: "",
                 env: {},
+                extensions: [],
                 globals: {},
                 noInlineConfig: void 0,
                 parser: null,
@@ -550,6 +552,7 @@ describe("ConfigArray", () => {
                         ecmaFeatures: { jsx: true }
                     },
                     env: { browser: true },
+                    extensions: ["ts"],
                     globals: { foo: false }
                 },
                 {
@@ -563,6 +566,7 @@ describe("ConfigArray", () => {
                         ecmaFeatures: { globalReturn: true }
                     },
                     env: { browser: false },
+                    extensions: ["vue"],
                     globals: { foo: true }
                 }
             ];
@@ -582,6 +586,7 @@ describe("ConfigArray", () => {
                 env: {
                     browser: false
                 },
+                extensions: ["vue", "ts"],
                 globals: {
                     foo: true
                 },
@@ -623,6 +628,7 @@ describe("ConfigArray", () => {
                     ecmaFeatures: { jsx: true }
                 },
                 env: { browser: true },
+                extensions: ["ts"],
                 globals: { foo: false }
             });
             assert.deepStrictEqual(config[1], {
@@ -636,6 +642,7 @@ describe("ConfigArray", () => {
                     ecmaFeatures: { globalReturn: true }
                 },
                 env: { browser: false },
+                extensions: ["vue"],
                 globals: { foo: true }
             });
         });

tests/lib/cli-engine/config-array/extracted-config.js

@@ -21,6 +21,10 @@ describe("'ExtractedConfig' class", () => {
             assert.deepStrictEqual(config.env, {});
         });
 
+        it("should have 'extensions' property.", () => {
+            assert.deepStrictEqual(config.extensions, []);
+        });
+
         it("should have 'globals' property.", () => {
             assert.deepStrictEqual(config.globals, {});
         });

tests/lib/cli-engine/file-enumerator.js

@@ -9,6 +9,7 @@ const path = require("path");
 const os = require("os");
 const { assert } = require("chai");
 const sh = require("shelljs");
+const { ConfigArrayFactory } = require("../../../lib/cli-engine/config-array-factory");
 const { CascadingConfigArrayFactory } =
     require("../../../lib/cli-engine/cascading-config-array-factory");
 const { IgnoredPaths } = require("../../../lib/cli-engine/ignored-paths");
@@ -476,4 +477,56 @@ describe("FileEnumerator", () => {
             });
         });
     });
+
+    describe("'getExtensionRegExp()' method should return correct regex", () => {
+        const { FileEnumerator } = require("../../../lib/cli-engine/file-enumerator");
+
+        /**
+         * Generate extension regex with reading from configuration.
+         * @param {import("../../../lib/shared/types").ConfigData} [config] ESLint configuration.
+         * @returns {RegExp} The RegExp to test if a string ends with specific file extensions.
+         */
+        function readFromConfig(config = {}) {
+            const configArrayFactory = new ConfigArrayFactory();
+            const filePath = path.join(process.cwd(), "foo.js");
+            const configArray = configArrayFactory.create(config, { filePath });
+            const fileEnumerator = new FileEnumerator();
+
+            return fileEnumerator.getExtensionRegExp(configArray, filePath);
+        }
+
+        it("should return default regex without configuration", () => {
+            const fileEnumerator = new FileEnumerator();
+            const regex = fileEnumerator.getExtensionRegExp();
+
+            assert.match("foo.js", regex);
+            assert.notMatch("foo.ts", regex);
+        });
+
+        it("should read from configuration", () => {
+            const regex = readFromConfig({ extensions: ["ts"] });
+
+            assert.match("foo.js", regex);
+            assert.match("foo.ts", regex);
+        });
+
+        it("should deduplicate extensions", () => {
+            const regex = readFromConfig({ extensions: ["js", "js"] });
+
+            assert.strictEqual(regex.source, ".\\.js$");
+        });
+
+        it("should strip prefixed dot", () => {
+            const regex = readFromConfig({ extensions: [".ts"] });
+
+            assert.strictEqual(regex.source, ".\\.js|ts$");
+        });
+
+        it("should allow missing in configuration", () => {
+            const regex = readFromConfig();
+
+            assert.match("foo.js", regex);
+            assert.notMatch("foo.ts", regex);
+        });
+    });
 });