Update: Allow eslint:all and eslint:recommended paths to be passed in (…

…#11) * Update: Allow eslint:all and eslint:recommended paths to be passed in * Fix ESLint errors * Clean up type information * Update lib/shared/types.js Co-authored-by: YeonJuan <yeonjuan93@naver.com> Co-authored-by: YeonJuan <yeonjuan93@naver.com>
eslint · Oct 15, 2020 · cb12255 · cb12255
1 parent a75bacd
commit cb12255
Show file tree

Hide file tree

Showing 8 changed files with 191 additions and 209 deletions.
diff --git a/conf/category-list.json b/conf/category-list.json
diff --git a/conf/default-cli-options.js b/conf/default-cli-options.js
diff --git a/conf/eslint-all.js b/conf/eslint-all.js
diff --git a/conf/eslint-recommended.js b/conf/eslint-recommended.js
diff --git a/conf/replacements.json b/conf/replacements.json
diff --git a/lib/cascading-config-array-factory.js b/lib/cascading-config-array-factory.js
@@ -36,9 +36,10 @@ const debug = require("debug")("eslintrc:cascading-config-array-factory");
 //------------------------------------------------------------------------------
 
 // Define types for VSCode IntelliSense.
-/** @typedef {import("../shared/types").ConfigData} ConfigData */
-/** @typedef {import("../shared/types").Parser} Parser */
-/** @typedef {import("../shared/types").Plugin} Plugin */
+/** @typedef {import("./shared/types").ConfigData} ConfigData */
+/** @typedef {import("./shared/types").Parser} Parser */
+/** @typedef {import("./shared/types").Plugin} Plugin */
+/** @typedef {import("./shared/types").Rule} Rule */
 /** @typedef {ReturnType<ConfigArrayFactory["create"]>} ConfigArray */
 
 /**
@@ -51,6 +52,11 @@ const debug = require("debug")("eslintrc:cascading-config-array-factory");
  * @property {string[]} [rulePaths] The value of `--rulesdir` option.
  * @property {string} [specificConfigPath] The value of `--config` option.
  * @property {boolean} [useEslintrc] if `false` then it doesn't load config files.
+ * @property {Function} loadRules The function to use to load rules.
+ * @property {Map<string,Rule>} builtInRules The rules that are built in to ESLint.
+ * @property {Object} [resolver=ModuleResolver] The module resolver object.
+ * @property {string} eslintAllPath The path to the definitions for eslint:all.
+ * @property {string} eslintRecommendedPath The path to the definitions for eslint:recommended.
  */
 
 /**
@@ -67,6 +73,11 @@ const debug = require("debug")("eslintrc:cascading-config-array-factory");
  * @property {string[]|null} rulePaths The value of `--rulesdir` option. This is used to reset `baseConfigArray`.
  * @property {string|null} specificConfigPath The value of `--config` option. This is used to reset `cliConfigArray`.
  * @property {boolean} useEslintrc if `false` then it doesn't load config files.
+ * @property {Function} loadRules The function to use to load rules.
+ * @property {Map<string,Rule>} builtInRules The rules that are built in to ESLint.
+ * @property {Object} [resolver=ModuleResolver] The module resolver object.
+ * @property {string} eslintAllPath The path to the definitions for eslint:all.
+ * @property {string} eslintRecommendedPath The path to the definitions for eslint:recommended.
  */
 
 /** @type {WeakMap<CascadingConfigArrayFactory, CascadingConfigArrayFactoryInternalSlots>} */
@@ -205,14 +216,18 @@ class CascadingConfigArrayFactory {
         useEslintrc = true,
         builtInRules = new Map(),
         loadRules,
-        resolver
+        resolver,
+        eslintRecommendedPath,
+        eslintAllPath
     } = {}) {
         const configArrayFactory = new ConfigArrayFactory({
             additionalPluginPool,
             cwd,
             resolvePluginsRelativeTo,
             builtInRules,
-            resolver
+            resolver,
+            eslintRecommendedPath,
+            eslintAllPath
         });
 
         internalSlotsMap.set(this, {

diff --git a/lib/config-array-factory.js b/lib/config-array-factory.js
@@ -58,8 +58,6 @@ const debug = require("debug")("eslintrc:config-array-factory");
 // Helpers
 //------------------------------------------------------------------------------
 
-const eslintRecommendedPath = path.resolve(__dirname, "../../eslint/conf/eslint-recommended.js");
-const eslintAllPath = path.resolve(__dirname, "../../eslint/conf/eslint-all.js");
 const configFilenames = [
     ".eslintrc.js",
     ".eslintrc.cjs",
@@ -71,10 +69,11 @@ const configFilenames = [
 ];
 
 // Define types for VSCode IntelliSense.
-/** @typedef {import("../shared/types").ConfigData} ConfigData */
-/** @typedef {import("../shared/types").OverrideConfigData} OverrideConfigData */
-/** @typedef {import("../shared/types").Parser} Parser */
-/** @typedef {import("../shared/types").Plugin} Plugin */
+/** @typedef {import("./shared/types").ConfigData} ConfigData */
+/** @typedef {import("./shared/types").OverrideConfigData} OverrideConfigData */
+/** @typedef {import("./shared/types").Parser} Parser */
+/** @typedef {import("./shared/types").Plugin} Plugin */
+/** @typedef {import("./shared/types").Rule} Rule */
 /** @typedef {import("./config-array/config-dependency").DependentParser} DependentParser */
 /** @typedef {import("./config-array/config-dependency").DependentPlugin} DependentPlugin */
 /** @typedef {ConfigArray[0]} ConfigArrayElement */
@@ -84,13 +83,21 @@ const configFilenames = [
  * @property {Map<string,Plugin>} [additionalPluginPool] The map for additional plugins.
  * @property {string} [cwd] The path to the current working directory.
  * @property {string} [resolvePluginsRelativeTo] A path to the directory that plugins should be resolved from. Defaults to `cwd`.
+ * @property {Map<string,Rule>} builtInRules The rules that are built in to ESLint.
+ * @property {Object} [resolver=ModuleResolver] The module resolver object.
+ * @property {string} eslintAllPath The path to the definitions for eslint:all.
+ * @property {string} eslintRecommendedPath The path to the definitions for eslint:recommended.
  */
 
 /**
  * @typedef {Object} ConfigArrayFactoryInternalSlots
  * @property {Map<string,Plugin>} additionalPluginPool The map for additional plugins.
  * @property {string} cwd The path to the current working directory.
  * @property {string | undefined} resolvePluginsRelativeTo An absolute path the the directory that plugins should be resolved from.
+ * @property {Map<string,Rule>} builtInRules The rules that are built in to ESLint.
+ * @property {Object} [resolver=ModuleResolver] The module resolver object.
+ * @property {string} eslintAllPath The path to the definitions for eslint:all.
+ * @property {string} eslintRecommendedPath The path to the definitions for eslint:recommended.
  */
 
 /**
@@ -414,7 +421,9 @@ class ConfigArrayFactory {
         cwd = process.cwd(),
         resolvePluginsRelativeTo,
         builtInRules,
-        resolver = ModuleResolver
+        resolver = ModuleResolver,
+        eslintAllPath,
+        eslintRecommendedPath
     } = {}) {
         internalSlotsMap.set(this, {
             additionalPluginPool,
@@ -423,7 +432,9 @@ class ConfigArrayFactory {
                 resolvePluginsRelativeTo &&
                 path.resolve(cwd, resolvePluginsRelativeTo),
             builtInRules,
-            resolver
+            resolver,
+            eslintAllPath,
+            eslintRecommendedPath
         });
     }
 
@@ -781,6 +792,8 @@ class ConfigArrayFactory {
      * @private
      */
     _loadExtendedBuiltInConfig(extendName, ctx) {
+        const { eslintAllPath, eslintRecommendedPath } = internalSlotsMap.get(this);
+
         if (extendName === "eslint:recommended") {
             return this._loadConfigData({
                 ...ctx,