From 9287d611c6512c13a599cba75c62524f7cfc6580 Mon Sep 17 00:00:00 2001 From: Kevin Partington Date: Fri, 29 Mar 2019 22:17:51 -0500 Subject: [PATCH 1/2] Build: gensite passes rulesMeta to formatter rendering --- Makefile.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/Makefile.js b/Makefile.js index fd501857e00..bc547536043 100644 --- a/Makefile.js +++ b/Makefile.js @@ -430,16 +430,17 @@ function getFormatterResults() { const stripAnsi = require("strip-ansi"); const formatterFiles = fs.readdirSync("./lib/formatters/"), + rules = { + "no-else-return": "warn", + indent: ["warn", 4], + "space-unary-ops": "error", + semi: ["warn", "always"], + "consistent-return": "error" + }, cli = new CLIEngine({ useEslintrc: false, baseConfig: { extends: "eslint:recommended" }, - rules: { - "no-else-return": 1, - indent: [1, 4], - "space-unary-ops": 2, - semi: [1, "always"], - "consistent-return": 2 - } + rules }), codeString = [ "function addOne(i) {", @@ -450,15 +451,25 @@ function getFormatterResults() { " }", "};" ].join("\n"), - rawMessages = cli.executeOnText(codeString, "fullOfProblems.js", true); + rawMessages = cli.executeOnText(codeString, "fullOfProblems.js", true), + rulesMap = cli.getRules(), + rulesMeta = Object.keys(rules).reduce((obj, ruleId) => { + obj[ruleId] = rulesMap.get(ruleId).meta; + return obj; + }, {}); return formatterFiles.reduce((data, filename) => { const fileExt = path.extname(filename), name = path.basename(filename, fileExt); if (fileExt === ".js") { + const formattedOutput = cli.getFormatter(name)( + rawMessages.results, + { rulesMeta } + ); + data.formatterResults[name] = { - result: stripAnsi(cli.getFormatter(name)(rawMessages.results)) + result: stripAnsi(formattedOutput) }; } return data; From 757d9dab6af52a0eb33a0c8d9da51db00473d42f Mon Sep 17 00:00:00 2001 From: Kevin Partington Date: Fri, 29 Mar 2019 22:30:17 -0500 Subject: [PATCH 2/2] Chore: Switching to forEach for readability --- Makefile.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.js b/Makefile.js index bc547536043..08e10256418 100644 --- a/Makefile.js +++ b/Makefile.js @@ -453,10 +453,11 @@ function getFormatterResults() { ].join("\n"), rawMessages = cli.executeOnText(codeString, "fullOfProblems.js", true), rulesMap = cli.getRules(), - rulesMeta = Object.keys(rules).reduce((obj, ruleId) => { - obj[ruleId] = rulesMap.get(ruleId).meta; - return obj; - }, {}); + rulesMeta = {}; + + Object.keys(rules).forEach(ruleId => { + rulesMeta[ruleId] = rulesMap.get(ruleId).meta; + }); return formatterFiles.reduce((data, filename) => { const fileExt = path.extname(filename),