Merge branch 'no-var-rule' of https://github.com/graingert/CyberChef into graingert-no-var-rule

This commit is contained in:
n1474335 2017-05-02 22:28:17 +01:00
commit d3377d56b4
65 changed files with 779 additions and 756 deletions

View file

@ -37,7 +37,7 @@ const Code = {
* @returns {html}
*/
runSyntaxHighlight: function(input, args) {
var language = args[0],
let language = args[0],
lineNums = args[1];
return "<code class='prettyprint'>" + prettyPrintOne(Utils.escapeHtml(input), language, lineNums) + "</code>";
},
@ -57,7 +57,7 @@ const Code = {
* @returns {string}
*/
runXmlBeautify: function(input, args) {
var indentStr = args[0];
const indentStr = args[0];
return vkbeautify.xml(input, indentStr);
},
@ -70,7 +70,7 @@ const Code = {
* @returns {string}
*/
runJsonBeautify: function(input, args) {
var indentStr = args[0];
const indentStr = args[0];
if (!input) return "";
return vkbeautify.json(input, indentStr);
},
@ -84,7 +84,7 @@ const Code = {
* @returns {string}
*/
runCssBeautify: function(input, args) {
var indentStr = args[0];
const indentStr = args[0];
return vkbeautify.css(input, indentStr);
},
@ -97,7 +97,7 @@ const Code = {
* @returns {string}
*/
runSqlBeautify: function(input, args) {
var indentStr = args[0];
const indentStr = args[0];
return vkbeautify.sql(input, indentStr);
},
@ -116,7 +116,7 @@ const Code = {
* @returns {string}
*/
runXmlMinify: function(input, args) {
var preserveComments = args[0];
const preserveComments = args[0];
return vkbeautify.xmlmin(input, preserveComments);
},
@ -142,7 +142,7 @@ const Code = {
* @returns {string}
*/
runCssMinify: function(input, args) {
var preserveComments = args[0];
const preserveComments = args[0];
return vkbeautify.cssmin(input, preserveComments);
},
@ -183,45 +183,45 @@ const Code = {
* @returns {string}
*/
runGenericBeautify: function(input, args) {
var code = input,
let code = input,
t = 0,
preservedTokens = [],
m;
// Remove strings
var sstrings = /'([^'\\]|\\.)*'/g;
const sstrings = /'([^'\\]|\\.)*'/g;
while ((m = sstrings.exec(code))) {
code = preserveToken(code, m, t++);
sstrings.lastIndex = m.index;
}
var dstrings = /"([^"\\]|\\.)*"/g;
const dstrings = /"([^"\\]|\\.)*"/g;
while ((m = dstrings.exec(code))) {
code = preserveToken(code, m, t++);
dstrings.lastIndex = m.index;
}
// Remove comments
var scomments = /\/\/[^\n\r]*/g;
const scomments = /\/\/[^\n\r]*/g;
while ((m = scomments.exec(code))) {
code = preserveToken(code, m, t++);
scomments.lastIndex = m.index;
}
var mcomments = /\/\*[\s\S]*?\*\//gm;
const mcomments = /\/\*[\s\S]*?\*\//gm;
while ((m = mcomments.exec(code))) {
code = preserveToken(code, m, t++);
mcomments.lastIndex = m.index;
}
var hcomments = /(^|\n)#[^\n\r#]+/g;
const hcomments = /(^|\n)#[^\n\r#]+/g;
while ((m = hcomments.exec(code))) {
code = preserveToken(code, m, t++);
hcomments.lastIndex = m.index;
}
// Remove regexes
var regexes = /\/.*?[^\\]\/[gim]{0,3}/gi;
const regexes = /\/.*?[^\\]\/[gim]{0,3}/gi;
while ((m = regexes.exec(code))) {
code = preserveToken(code, m, t++);
regexes.lastIndex = m.index;
@ -243,8 +243,9 @@ const Code = {
.replace(/\n{/g, "{");
// Indent
var i = 0,
level = 0;
let i = 0,
level = 0,
indent;
while (i < code.length) {
switch (code[i]) {
case "{":
@ -254,7 +255,7 @@ const Code = {
if (i+1 >= code.length) break;
if (code[i+1] === "}") level--;
var indent = (level >= 0) ? Array(level*4+1).join(" ") : "";
indent = (level >= 0) ? Array(level*4+1).join(" ") : "";
code = code.substring(0, i+1) + indent + code.substring(i+1);
if (level > 0) i += level*4;
@ -287,9 +288,9 @@ const Code = {
.replace(/}\s*(else|catch|except|finally|elif|elseif|else if)/gi, "} $1");
// Replace preserved tokens
var ptokens = /###preservedToken(\d+)###/g;
const ptokens = /###preservedToken(\d+)###/g;
while ((m = ptokens.exec(code))) {
var ti = parseInt(m[1], 10);
const ti = parseInt(m[1], 10);
code = code.substring(0, m.index) + preservedTokens[ti] + code.substring(m.index + m[0].length);
ptokens.lastIndex = m.index;
}
@ -329,24 +330,24 @@ const Code = {
* @returns {string}
*/
runXpath:function(input, args) {
var query = args[0],
let query = args[0],
delimiter = args[1];
var doc;
let doc;
try {
doc = new dom().parseFromString(input);
} catch (err) {
return "Invalid input XML.";
}
var nodes;
let nodes;
try {
nodes = xpath.select(query, doc);
} catch (err) {
return "Invalid XPath. Details:\n" + err.message;
}
var nodeToString = function(node) {
const nodeToString = function(node) {
return node.toString();
};
@ -376,7 +377,7 @@ const Code = {
* @returns {string}
*/
runCSSQuery: function(input, args) {
var query = args[0],
let query = args[0],
delimiter = args[1],
parser = new DOMParser(),
html,
@ -398,7 +399,7 @@ const Code = {
return "Invalid CSS Selector. Details:\n" + err.message;
}
var nodeToString = function(node) {
const nodeToString = function(node) {
switch (node.nodeType) {
case Node.ELEMENT_NODE: return node.outerHTML;
case Node.ATTRIBUTE_NODE: return node.value;