From 33464b3388a8dd61b9361bea91ba7e3cc46e5b66 Mon Sep 17 00:00:00 2001 From: n1073645 Date: Thu, 14 Nov 2019 08:55:27 +0000 Subject: [PATCH] Linting changes --- .eslintrc.json | 1 + src/core/Utils.mjs | 14 +++++----- src/core/config/scripts/generateConfig.mjs | 2 +- src/core/config/scripts/generateOpsIndex.mjs | 2 +- src/core/config/scripts/newOperation.mjs | 4 +-- src/core/operations/FromMorseCode.mjs | 2 +- src/core/operations/GroupIPAddresses.mjs | 2 +- src/core/operations/Lorenz.mjs | 4 +-- src/node/api.mjs | 2 +- src/node/cjs.js | 2 +- src/node/config/scripts/generateNodeIndex.mjs | 2 +- src/node/repl.js | 2 +- src/web/App.mjs | 2 +- src/web/waiters/HighlighterWaiter.mjs | 2 +- src/web/waiters/InputWaiter.mjs | 28 +++++++++---------- tests/node/tests/NodeDish.mjs | 2 +- tests/operations/tests/ByteRepr.mjs | 2 +- tests/operations/tests/Hash.mjs | 4 +-- tests/operations/tests/Image.mjs | 4 +-- 19 files changed, 42 insertions(+), 41 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index e307112b..e9fa15db 100755 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -47,6 +47,7 @@ "block-spacing": "error", "array-bracket-spacing": "error", "comma-spacing": "error", + "spaced-comment": ["error", "always", { "exceptions": ["/"] } ], "comma-style": "error", "computed-property-spacing": "error", "no-trailing-spaces": "warn", diff --git a/src/core/Utils.mjs b/src/core/Utils.mjs index e64aba4b..0f10cb8a 100755 --- a/src/core/Utils.mjs +++ b/src/core/Utils.mjs @@ -758,15 +758,15 @@ class Utils { "%7E": "~", "%21": "!", "%24": "$", - //"%26": "&", + // "%26": "&", "%27": "'", "%28": "(", "%29": ")", "%2A": "*", - //"%2B": "+", + // "%2B": "+", "%2C": ",", "%3B": ";", - //"%3D": "=", + // "%3D": "=", "%3A": ":", "%40": "@", "%2F": "/", @@ -1335,14 +1335,14 @@ export function debounce(func, wait, id, scope, args) { // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padStart if (!String.prototype.padStart) { String.prototype.padStart = function padStart(targetLength, padString) { - targetLength = targetLength>>0; //floor if number or convert non-number to 0; + targetLength = targetLength>>0; // floor if number or convert non-number to 0; padString = String((typeof padString !== "undefined" ? padString : " ")); if (this.length > targetLength) { return String(this); } else { targetLength = targetLength-this.length; if (targetLength > padString.length) { - padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed + padString += padString.repeat(targetLength/padString.length); // append to original to ensure we are longer than needed } return padString.slice(0, targetLength) + String(this); } @@ -1354,14 +1354,14 @@ if (!String.prototype.padStart) { // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padEnd if (!String.prototype.padEnd) { String.prototype.padEnd = function padEnd(targetLength, padString) { - targetLength = targetLength>>0; //floor if number or convert non-number to 0; + targetLength = targetLength>>0; // floor if number or convert non-number to 0; padString = String((typeof padString !== "undefined" ? padString : " ")); if (this.length > targetLength) { return String(this); } else { targetLength = targetLength-this.length; if (targetLength > padString.length) { - padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed + padString += padString.repeat(targetLength/padString.length); // append to original to ensure we are longer than needed } return String(this) + padString.slice(0, targetLength); } diff --git a/src/core/config/scripts/generateConfig.mjs b/src/core/config/scripts/generateConfig.mjs index 8ef906e6..e8f99e40 100644 --- a/src/core/config/scripts/generateConfig.mjs +++ b/src/core/config/scripts/generateConfig.mjs @@ -9,7 +9,7 @@ * @license Apache-2.0 */ -/*eslint no-console: ["off"] */ +/* eslint no-console: ["off"] */ import path from "path"; import fs from "fs"; diff --git a/src/core/config/scripts/generateOpsIndex.mjs b/src/core/config/scripts/generateOpsIndex.mjs index d18307bc..750ee6f4 100644 --- a/src/core/config/scripts/generateOpsIndex.mjs +++ b/src/core/config/scripts/generateOpsIndex.mjs @@ -7,7 +7,7 @@ * @license Apache-2.0 */ -/*eslint no-console: ["off"] */ +/* eslint no-console: ["off"] */ import path from "path"; import fs from "fs"; diff --git a/src/core/config/scripts/newOperation.mjs b/src/core/config/scripts/newOperation.mjs index 03753fae..809f3558 100644 --- a/src/core/config/scripts/newOperation.mjs +++ b/src/core/config/scripts/newOperation.mjs @@ -6,7 +6,7 @@ * @license Apache-2.0 */ -/*eslint no-console: ["off"] */ +/* eslint no-console: ["off"] */ import prompt from "prompt"; import colors from "colors"; @@ -208,7 +208,7 @@ ${result.highlight ? ` export default ${moduleName}; `; - //console.log(template); + // console.log(template); const filename = path.join(dir, `./${moduleName}.mjs`); if (fs.existsSync(filename)) { diff --git a/src/core/operations/FromMorseCode.mjs b/src/core/operations/FromMorseCode.mjs index e7714912..42005f4d 100644 --- a/src/core/operations/FromMorseCode.mjs +++ b/src/core/operations/FromMorseCode.mjs @@ -59,7 +59,7 @@ class FromMorseCode extends Operation { const letterDelim = Utils.charRep(args[0]); const wordDelim = Utils.charRep(args[1]); - input = input.replace(/-|‐|−|_|–|—|dash/ig, ""); //hyphen-minus|hyphen|minus-sign|undersore|en-dash|em-dash + input = input.replace(/-|‐|−|_|–|—|dash/ig, ""); // hyphen-minus|hyphen|minus-sign|undersore|en-dash|em-dash input = input.replace(/\.|·|dot/ig, ""); let words = input.split(wordDelim); diff --git a/src/core/operations/GroupIPAddresses.mjs b/src/core/operations/GroupIPAddresses.mjs index bf7c6db8..06840eeb 100644 --- a/src/core/operations/GroupIPAddresses.mjs +++ b/src/core/operations/GroupIPAddresses.mjs @@ -117,7 +117,7 @@ class GroupIPAddresses extends Operation { // Sort IPv6 network dictionaries and print for (networkStr in ipv6Networks) { - //ipv6Networks[networkStr] = ipv6Networks[networkStr].sort(); TODO + // ipv6Networks[networkStr] = ipv6Networks[networkStr].sort(); TODO output += networkStr + "/" + cidr + "\n"; diff --git a/src/core/operations/Lorenz.mjs b/src/core/operations/Lorenz.mjs index b001823a..52b512eb 100644 --- a/src/core/operations/Lorenz.mjs +++ b/src/core/operations/Lorenz.mjs @@ -391,7 +391,7 @@ class Lorenz extends Operation { // Chi 2 one back lim - The active character of Chi 2 (2nd Chi wheel) in the previous position lim = parseInt(chiSettings[2][x2bptr-1], 10); if (kt) { - //p5 back 2 + // p5 back 2 if (lim===p5[2]) { lim = 0; } else { @@ -413,7 +413,7 @@ class Lorenz extends Operation { lim = 1; if (x2b1lug===s1b1lug) lim=0; if (kt) { - //p5 back 2 + // p5 back 2 if (lim===p5[2]) { lim=0; } else { diff --git a/src/node/api.mjs b/src/node/api.mjs index fca29dd8..7d53084b 100644 --- a/src/node/api.mjs +++ b/src/node/api.mjs @@ -6,7 +6,7 @@ * @license Apache-2.0 */ -/*eslint no-console: ["off"] */ +/* eslint no-console: ["off"] */ import NodeDish from "./NodeDish.mjs"; import NodeRecipe from "./NodeRecipe.mjs"; diff --git a/src/node/cjs.js b/src/node/cjs.js index a17bce53..0f502ee9 100644 --- a/src/node/cjs.js +++ b/src/node/cjs.js @@ -7,7 +7,7 @@ * @license Apache-2.0 */ -/*eslint no-global-assign: ["off"] */ +/* eslint no-global-assign: ["off"] */ require = require("esm")(module); module.exports = require("./index.mjs"); module.exports.File = require("./File.mjs"); diff --git a/src/node/config/scripts/generateNodeIndex.mjs b/src/node/config/scripts/generateNodeIndex.mjs index b65b7d3c..81ca8fe6 100644 --- a/src/node/config/scripts/generateNodeIndex.mjs +++ b/src/node/config/scripts/generateNodeIndex.mjs @@ -9,7 +9,7 @@ * @license Apache-2.0 */ -/*eslint no-console: 0 */ +/* eslint no-console: 0 */ import fs from "fs"; import path from "path"; diff --git a/src/node/repl.js b/src/node/repl.js index c9ed76f1..29154630 100644 --- a/src/node/repl.js +++ b/src/node/repl.js @@ -11,7 +11,7 @@ const chef = require("./cjs.js"); const repl = require("repl"); -/*eslint no-console: ["off"] */ +/* eslint no-console: ["off"] */ console.log(` ______ __ ________ ____ diff --git a/src/web/App.mjs b/src/web/App.mjs index 1039b7b2..a5806162 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -604,7 +604,7 @@ class App { else if (prev[1] > 0) prev[1]--; else prev[0]--; - //const compareURL = `https://github.com/gchq/CyberChef/compare/v${prev.join(".")}...v${PKG_VERSION}`; + // const compareURL = `https://github.com/gchq/CyberChef/compare/v${prev.join(".")}...v${PKG_VERSION}`; let compileInfo = `Last build: ${timeSinceCompile.substr(0, 1).toUpperCase() + timeSinceCompile.substr(1)} ago`; diff --git a/src/web/waiters/HighlighterWaiter.mjs b/src/web/waiters/HighlighterWaiter.mjs index 95050556..22d1e803 100755 --- a/src/web/waiters/HighlighterWaiter.mjs +++ b/src/web/waiters/HighlighterWaiter.mjs @@ -446,7 +446,7 @@ class HighlighterWaiter { } const cssClass = "hl1"; - //if (colour) cssClass += "-"+colour; + // if (colour) cssClass += "-"+colour; // Remove HTML tags text = text diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs index 6fc240b3..9cb9b134 100644 --- a/src/web/waiters/InputWaiter.mjs +++ b/src/web/waiters/InputWaiter.mjs @@ -29,20 +29,20 @@ class InputWaiter { // Define keys that don't change the input so we don't have to autobake when they are pressed this.badKeys = [ - 16, //Shift - 17, //Ctrl - 18, //Alt - 19, //Pause - 20, //Caps - 27, //Esc - 33, 34, 35, 36, //PgUp, PgDn, End, Home - 37, 38, 39, 40, //Directional - 44, //PrntScrn - 91, 92, //Win - 93, //Context - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, //F1-12 - 144, //Num - 145, //Scroll + 16, // Shift + 17, // Ctrl + 18, // Alt + 19, // Pause + 20, // Caps + 27, // Esc + 33, 34, 35, 36, // PgUp, PgDn, End, Home + 37, 38, 39, 40, // Directional + 44, // PrntScrn + 91, 92, // Win + 93, // Context + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, // F1-12 + 144, // Num + 145, // Scroll ]; this.inputWorker = null; diff --git a/tests/node/tests/NodeDish.mjs b/tests/node/tests/NodeDish.mjs index 72120703..429c38af 100644 --- a/tests/node/tests/NodeDish.mjs +++ b/tests/node/tests/NodeDish.mjs @@ -125,7 +125,7 @@ TestRegister.addApiTests([ Click here -`.replace(/\n|\s{4}/g, ""); //remove newlines, tabs +`.replace(/\n|\s{4}/g, ""); // remove newlines, tabs const dish = new Dish(html, Dish.HTML); dish.get(4); diff --git a/tests/operations/tests/ByteRepr.mjs b/tests/operations/tests/ByteRepr.mjs index 51d9604d..2bb289ad 100644 --- a/tests/operations/tests/ByteRepr.mjs +++ b/tests/operations/tests/ByteRepr.mjs @@ -73,7 +73,7 @@ TestRegister.addTests([ }, { name: "To Octal: Γειά σου", - input: "Γειά σου", //[206,147,206,181,206,185,206,172,32,207,131,206,191,207,133], + input: "Γειά σου", // [206,147,206,181,206,185,206,172,32,207,131,206,191,207,133], expectedOutput: "316 223 316 265 316 271 316 254 40 317 203 316 277 317 205", recipeConfig: [ { diff --git a/tests/operations/tests/Hash.mjs b/tests/operations/tests/Hash.mjs index 9da5cfb6..bccdc6b7 100644 --- a/tests/operations/tests/Hash.mjs +++ b/tests/operations/tests/Hash.mjs @@ -1099,7 +1099,7 @@ TestRegister.addTests([ } ] } - /*{ // This takes a LONG time to run (over a minute usually). + /* { // This takes a LONG time to run (over a minute usually). name: "Scrypt: RFC test vector 4", input: "pleaseletmein", expectedOutput: "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4", @@ -1115,5 +1115,5 @@ TestRegister.addTests([ ] } ] - },*/ + }, */ ]); diff --git a/tests/operations/tests/Image.mjs b/tests/operations/tests/Image.mjs index 7a5b4421..ad3408dc 100644 --- a/tests/operations/tests/Image.mjs +++ b/tests/operations/tests/Image.mjs @@ -248,7 +248,7 @@ TestRegister.addTests([ } ] }, - /*{ This operation only works in a browser + /* { This operation only works in a browser name: "Optical Character Recognition", input: "iVBORw0KGgoAAAANSUhEUgAAAUAAAAC0CAIAAABqhmJGAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASuSURBVHhe7dftVdswAIbRzsVAzMM0XabDUCOUxLYsWW4Jp+/pvf9w9GH76CHw4x2IJWAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAI9p8G/PbyY8rL2686g8t+vnqHTyfgIYfvz/26veTXn/UKX8+f0EU9bHrtu/6KfAN/AwEXAj7lFf2TBFw4nae8on+SgIvJ01n/KLzpDK+L3bT/Ap4O+HC+V12mTH+M3gzcLbIY/EO6HfxYp13k09nb6r3UqcdnjoCL3ll72J26h+35Oxy2XvZ0wOLaXq9v2+F1UC+7RZtMZ/DnfX1lwDOPzwUCLo7O2trtDK8H3M/iqoc6bj1subT68XTA/F7bGJooyzKbhTvLPHY8eJLHlbNX1DqYUVfdXbqwJjsCLsans37aNNJM6w68OR0wv9f9ymKw3k67yn2ZZpHlg3a3zis60s6oV+ZvlzMCLoanc3Dsdt9TdWT/lM8OmNjr5KY72jmzq1zfrbvXtVtmRMDF8HTWcgaaqIrD1U4G/MFewxrW262s5jS/Fzpmdts6mnHy+Fwl4GJ0OjsNrG1P/y7CNo3+gEt7jW56MVprNed7A/5w+n6YJ+BieDpnj/jO6pweTz0acGWvmZveL9XOmd3x6wKuTt8PEwRczLRw4eje1XX7c/cDruw1uuneOu2c4aOvzI57mJhRh1xZlQ0BF+Oz9vcF96fuB1zYa7R2b5mD6/XSwdfg8snj4q21+W/L02dfzIxhQMDFyTm6Hd7m+JYP7rPKT5sRuzhOBywm91rUkYc3fV9ltchtr8VmzuGOdfDB9N1tFYefNfdXLmyGjNZkhoCLUQufVqd/7z7rUcLW/XieDvg0s9difNOdRV5ePibt5vTuazusWbF9rs2E5v4mH58LBFyMW7g5OID7s9cMuTygmt9rcNPb5MrAz0lHc3Z9Ht7XZsxqxO36ZtLR/c0+PpMEzLOc/4LhrwmYZ6lfywJ+JgHzJPr9DgLmi23/zdXvcwmYL7YKWL1PJ2AIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmCI9f7+G6yFxVg/GyYwAAAAAElFTkSuQmCC", expectedOutput: "Tesseract.js\n", @@ -262,5 +262,5 @@ TestRegister.addTests([ "args": [false] } ] - }*/ + } */ ]);