Skip to content

Rule Blocklist #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions lib/config_finder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"use strict";

const CONFIG_FILES = require("eslint/lib/config/config-file").CONFIG_FILES
, FileFinder = require("eslint/lib/file-finder")
, path = require("path");

module.exports = function(configFile, analysisFiles) {
if (configFile) {
return [configFile];
}

const dirs = analysisFiles.map(function(fileName){
return path.dirname(fileName);
});
const directories = Array.from(new Set(dirs));

const localConfigFinder = new FileFinder(CONFIG_FILES, process.cwd());

const configs = new Set();
for (const dir of directories) {
const configFiles = localConfigFinder.findAllInDirectoryAndParents(dir);
for (const file of configFiles) {
configs.add(file);
}
}

return Array.from(configs);
};
34 changes: 4 additions & 30 deletions lib/config_upgrader.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use strict";

const Config = require("eslint/lib/config")
const
Config = require("eslint/lib/config")
, merge = require("eslint/lib/config/config-ops").merge
, path = require("path")
, stringify = require("json-stable-stringify")
, CONFIG_FILES = require("eslint/lib/config/config-file").CONFIG_FILES
, FileFinder = require("eslint/lib/file-finder");
;

var SEVERITIES = {
0: "off",
Expand Down Expand Up @@ -226,34 +226,8 @@ class ConfigUpgrader {
return [].concat(this._report);
}

static configs(analysisFiles) {
const dirs = analysisFiles.map(function(fileName){
return path.dirname(fileName);
});
const directories = Array.from(new Set(dirs));

const localConfigFinder = new FileFinder(CONFIG_FILES, process.cwd());

const configs = new Set();
for (const dir of directories) {
const configFiles = localConfigFinder.findAllInDirectoryAndParents(dir);
for (const file of configFiles) {
configs.add(file);
}
}

return Array.from(configs);
}

static upgradeInstructions(configFile, analysisFiles, root) {
let configs;
if (configFile) {
configs = [configFile];
}
else {
configs = this.configs(analysisFiles);
}

static upgradeInstructions(configs, root) {
const reports = configs.map(function(configFile) {
let report = [];

Expand Down
6 changes: 5 additions & 1 deletion lib/eslint-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const ConfigFile = require("eslint/lib/config/config-file");

const Config = require("eslint/lib/config");
const ConfigUpgrader = require("./config_upgrader");
const RuleBlocklist = require("./rule_blocklist");

module.exports = function patch() {
const skippedModules = [];
Expand Down Expand Up @@ -43,8 +44,11 @@ module.exports = function patch() {
Config.prototype.getConfig = function(filePath) {
const originalConfig = originalGetConfig.apply(this, [filePath]);
const configUpgrader = new ConfigUpgrader();
const ruleBlocklist = new RuleBlocklist();

return configUpgrader.upgrade(originalConfig);
return ruleBlocklist.filter(
configUpgrader.upgrade(originalConfig)
);
};

return require('eslint');
Expand Down
12 changes: 11 additions & 1 deletion lib/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const checks = require("./checks");
const validateConfig = require("./validate_config");
const computeFingerprint = require("./compute_fingerprint");
const ConfigUpgrader = require("./config_upgrader");
const RuleBlocklist = require("./rule_blocklist");
const findConfigs = require("./config_finder");

const CLIEngine = eslint.CLIEngine;
const options = { extensions: [".js"], ignore: true, reset: false, useEslintrc: true };
Expand Down Expand Up @@ -230,7 +232,15 @@ function run(console, runOptions) {
if (validateConfig(options.configFile)) {
console.error("ESLint is running with the " + cli.getConfigForFile(null).parser + " parser.");

for (const line of ConfigUpgrader.upgradeInstructions(options.configFile, analysisFiles, process.cwd())) {

let configs = findConfigs(options.configFile, analysisFiles);

let report = [
ConfigUpgrader.upgradeInstructions(configs, process.cwd()),
RuleBlocklist.report(configs)
].reduce(function(a, b) { return a.concat([""]).concat(b); });

for (const line of report) {
console.error(line);
}

Expand Down
86 changes: 86 additions & 0 deletions lib/rule_blocklist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
"use strict";

const Config = require("eslint/lib/config")
, merge = require("eslint/lib/config/config-ops").merge;

const blocklistedRules = [
"import/no-unresolved",
"import/extensions",
"import/no-absolute-path"
];

function filterRules(rules) {
let report = [];

for (const name of blocklistedRules) {
if (Reflect.has(rules, name)) {
let config = rules[name];
if (config.constructor !== Array) {
config = [config];
}
let severity = config.shift();

if (severity !== 0 && !(typeof severity === "string" && severity.toLowerCase() === "off")) {
rules[name] = "off";
report.push(`* ${name}`);
}
}
}
return report;
}

class RuleBlocklist {
constructor() {
this._report = [];
}

filter(originalConfig) {
if (typeof originalConfig === "undefined" || originalConfig === null) {
return {};
}

let config = merge({}, originalConfig);

this._report = [];

if (Reflect.has(config, "rules")) {
let report = filterRules(config.rules);
this._report = this._report.concat(report);
}

return config;
}

get report() {
return [].concat(this._report);
}

static report(configs) {
const reports = configs.map(function(configFile) {
let report = [];

const blocklist = new RuleBlocklist();
const config = new Config({
configFile: configFile,
cwd: process.cwd()
});
blocklist.filter(config.useSpecificConfig);

if (report.length > 0 || blocklist.report.length > 0) {
report = report.concat(blocklist.report);
}

return report;
});

if (reports.length === 0) {
return [];
} else {
return [["Ignoring the following rules that rely on module resolution:"]]
.concat(reports)
.reduce(function(a, b) { return a.concat([""]).concat(b); });
}
}
}

module.exports = RuleBlocklist;
67 changes: 67 additions & 0 deletions test/config_finder_test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
const findConfigs = require("../lib/config_finder")
, expect = require("chai").expect
, fs = require("fs")
, path = require("path")
, temp = require('temp');

describe("findConfigs", function() {
it("finds configs", function(done) {
temp.mkdir("code ", function(err, directory) {
if (err) { throw err; }

process.chdir(directory);

const configPath = path.join(directory, ".eslintrc");
fs.writeFile(configPath, "{}", function(err) {
if (err) { throw err; }


let configs = findConfigs(null, [directory + '/file.js']);
expect(configs).to.deep.eq([directory + '/.eslintrc']);
done();
});
});
});

it("ignores irrelevant configs", function(done) {
temp.mkdir("code ", function(err, directory) {
if (err) { throw err; }

process.chdir(directory);

const configPath = path.join(directory, ".eslintrc.json");
fs.writeFile(configPath, "{}", function(err) {
if (err) { throw err; }

fs.mkdir(path.join(directory, "lib"), function(err) {
if (err) { throw err; }

fs.writeFile(path.join(directory, "lib", ".eslintrc"), "{}", function(err) {
if (err) { throw err; }

let configs = findConfigs(null, [directory + '/file.js']);
expect(configs).to.deep.eq([directory + "/.eslintrc.json"]);
done();
});
});
});
});
});

it("uses specific configs", function(done) {
temp.mkdir("code", function(err, directory) {
if (err) { throw err; }

process.chdir(directory);

const configPath = path.join(directory, "codeclimate-eslint");
fs.writeFile(configPath, "{}", function(err) {
if (err) { throw err; }

let configs = findConfigs("codeclimate-eslint", [directory + '/file.js']);
expect(configs).to.deep.eq(["codeclimate-eslint"]);
done();
});
});
});
});
50 changes: 1 addition & 49 deletions test/config_upgrater_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("ConfigUpgrader", function() {


let report = ConfigUpgrader
.upgradeInstructions(null, [directory + '/file.js'], directory);
.upgradeInstructions([directory + '/.eslintrc'], directory);
expect(report).to.deep.eq([
".eslintrc appears to be incompatible with ESLint 3.",
"To upgrade it do the following:\n",
Expand All @@ -29,54 +29,6 @@ describe("ConfigUpgrader", function() {
});
});
});

it("ignores irrelevant configs", function(done) {
temp.mkdir("code ", function(err, directory) {
if (err) { throw err; }

process.chdir(directory);

const configPath = path.join(directory, ".eslintrc.json");
fs.writeFile(configPath, "{}", function(err) {
if (err) { throw err; }

fs.mkdir(path.join(directory, "lib"), function(err) {
if (err) { throw err; }

fs.writeFile(path.join(directory, "lib", ".eslintrc"), "{}", function(err) {
if (err) { throw err; }

let report = ConfigUpgrader
.upgradeInstructions(null, [directory + '/file.js'], directory);
expect(report).to.deep.eq([]);
done();
});
});
});
});
});

it("uses specific configs", function(done) {
temp.mkdir("code", function(err, directory) {
if (err) { throw err; }

process.chdir(directory);

const configPath = path.join(directory, "codeclimate-eslint");
fs.writeFile(configPath, "{}", function(err) {
if (err) { throw err; }

let report = ConfigUpgrader
.upgradeInstructions("codeclimate-eslint", [directory + '/file.js'], directory);
expect(report).to.deep.eq([
"codeclimate-eslint appears to be incompatible with ESLint 3.",
"To upgrade it do the following:\n",
"* Add .yml or .json to the config file name. Extension-less config file names are deprecated."
]);
done();
});
});
});
});


Expand Down
Loading