Restructured src files into a more logical hierarchy

Gruntfile.js

@@ -1,7 +1,7 @@
 var webpack = require("webpack"),
     ExtractTextPlugin = require("extract-text-webpack-plugin");
 
-module.exports = function(grunt) {
+module.exports = function (grunt) {
     grunt.file.defaultEncoding = "utf8";
     grunt.file.preserveBOM = false;
 
@@ -21,7 +21,7 @@ module.exports = function(grunt) {
     grunt.registerTask("prod",
         "Creates a production-ready build. Use the --msg flag to add a compile message.",
         ["eslint", "test", "exec:stats", "clean", "jsdoc", "webpack:web", "copy:htmlDev", "copy:htmlProd", "copy:htmlInline",
-         "copy:staticDev", "copy:staticProd", "cssmin", "uglify:prod", "inline", "htmlmin", "docs", "chmod"]);
+         "copy:staticDev", "copy:staticProd", "cssmin", "uglify:prod", "inline", "htmlmin", "chmod"]);
 
     grunt.registerTask("docs",
         "Compiles documentation in the /docs directory.",
@@ -61,32 +61,32 @@ module.exports = function(grunt) {
 
 
     var compileTime = grunt.template.today("dd/mm/yyyy HH:MM:ss") + " UTC",
-        banner = '/**\n\
- * CyberChef - The Cyber Swiss Army Knife\n\
- *\n\
- * @copyright Crown Copyright 2016\n\
- * @license Apache-2.0\n\
- *\n\
- *   Copyright 2016 Crown Copyright\n\
- *\n\
- * Licensed under the Apache License, Version 2.0 (the "License");\n\
- * you may not use this file except in compliance with the License.\n\
- * You may obtain a copy of the License at\n\
- *\n\
- *     http://www.apache.org/licenses/LICENSE-2.0\n\
- *\n\
- * Unless required by applicable law or agreed to in writing, software\n\
- * distributed under the License is distributed on an "AS IS" BASIS,\n\
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
- * See the License for the specific language governing permissions and\n\
- * limitations under the License.\n\
- */\n';
+        banner = "/**\n" +
+            "* CyberChef - The Cyber Swiss Army Knife\n" +
+            "*\n" +
+            "* @copyright Crown Copyright 2016\n" +
+            "* @license Apache-2.0\n" +
+            "*\n" +
+            "*   Copyright 2016 Crown Copyright\n" +
+            "*\n" +
+            '* Licensed under the Apache License, Version 2.0 (the "License");\n' +
+            "* you may not use this file except in compliance with the License.\n" +
+            "* You may obtain a copy of the License at\n" +
+            "*\n" +
+            "*     http://www.apache.org/licenses/LICENSE-2.0\n" +
+            "*\n" +
+            "* Unless required by applicable law or agreed to in writing, software\n" +
+            '* distributed under the License is distributed on an "AS IS" BASIS,\n' +
+            "* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +
+            "* See the License for the specific language governing permissions and\n" +
+            "* limitations under the License.\n" +
+            "*/\n";
 
     var templateOptions = {
         data: {
             compileTime: compileTime,
             compileMsg: grunt.option("compile-msg") || grunt.option("msg") || "",
-            codebaseStats: grunt.file.read("src/static/stats.txt").split("\n").join("<br>")
+            codebaseStats: grunt.file.read("src/web/static/stats.txt").split("\n").join("<br>")
         }
     };
 
@@ -94,13 +94,12 @@ module.exports = function(grunt) {
     grunt.initConfig({
         eslint: {
             options: {
-                configFile: "src/js/.eslintrc.json"
+                configFile: "src/.eslintrc.json"
             },
             gruntfile: ["Gruntfile.js"],
-            core: ["src/js/core/**/*.js"],
-            config: ["src/js/config/**/*.js"],
-            views: ["src/js/views/**/*.js"],
-            operations: ["src/js/operations/**/*.js"],
+            core: ["src/core/**/*.js", "!src/core/lib/**/*"],
+            web: ["src/web/**/*.js"],
+            node: ["src/node/**/*.js"],
             tests: ["test/**/*.js"],
         },
         jsdoc: {
@@ -113,8 +112,8 @@ module.exports = function(grunt) {
             },
             all: {
                 src: [
-                    "src/js/**/*.js",
-                    "!src/js/lib/**/*",
+                    "src/**/*.js",
+                    "!src/core/lib/**/*",
                 ],
             }
         },
@@ -165,8 +164,8 @@ module.exports = function(grunt) {
                     "bootstrap",
                     "bootstrap-switch",
                     "bootstrap-colorpicker",
-                    "./src/css/index.js",
-                    "./src/js/views/html/main.js"
+                    "./src/web/css/index.js",
+                    "./src/web/index.js"
                 ],
                 output: {
                     filename: "scripts.js",
@@ -218,7 +217,7 @@ module.exports = function(grunt) {
             },
             node: {
                 target: "node",
-                entry: ["babel-polyfill", "./src/js/views/node/index.js"],
+                entry: ["babel-polyfill", "./src/node/index.js"],
                 output: {
                     filename: "CyberChef.js",
                     path: "build/node",
@@ -236,25 +235,25 @@ module.exports = function(grunt) {
         copy: {
             htmlDev: {
                 options: {
-                    process: function(content, srcpath) {
+                    process: function (content, srcpath) {
                         return grunt.template.process(content, templateOptions);
                     }
                 },
-                src: "src/html/index.html",
+                src: "src/web/html/index.html",
                 dest: "build/dev/index.html"
             },
             htmlProd: {
                 options: {
-                    process: function(content, srcpath) {
+                    process: function (content, srcpath) {
                         return grunt.template.process(content, templateOptions);
                     }
                 },
-                src: "src/html/index.html",
+                src: "src/web/html/index.html",
                 dest: "build/prod/index.html"
             },
             htmlInline: {
                 options: {
-                    process: function(content, srcpath) {
+                    process: function (content, srcpath) {
                         // TODO: Do all this in Jade
                         content = content.replace(
                             '<a href="cyberchef.htm" style="float: left; margin-left: 10px; margin-right: 80px;" download>Download CyberChef<img src="images/download-24x24.png" /></a>',
@@ -262,14 +261,14 @@ module.exports = function(grunt) {
                         return grunt.template.process(content, templateOptions);
                     }
                 },
-                src: "src/html/index.html",
+                src: "src/web/html/index.html",
                 dest: "build/prod/cyberchef.htm"
             },
             staticDev: {
                 files: [
                     {
                         expand: true,
-                        cwd: "src/static/",
+                        cwd: "src/web/static/",
                         src: [
                             "**/*",
                             "**/.*",
@@ -284,7 +283,7 @@ module.exports = function(grunt) {
                 files: [
                     {
                         expand: true,
-                        cwd: "src/static/",
+                        cwd: "src/web/static/",
                         src: [
                             "**/*",
                             "**/.*",
@@ -297,7 +296,7 @@ module.exports = function(grunt) {
             },
             ghPages: {
                 options: {
-                    process: function(content, srcpath) {
+                    process: function (content, srcpath) {
                         // Add Google Analytics code to index.html
                         content = content.replace("</body></html>",
                             grunt.file.read("src/static/ga.html") + "</body></html>");
@@ -310,7 +309,7 @@ module.exports = function(grunt) {
         },
         uglify: {
             options: {
-                preserveComments: function(node, comment) {
+                preserveComments: function (node, comment) {
                     if (comment.value.indexOf("* @license") === 0) return true;
                     return false;
                 },
@@ -403,47 +402,39 @@ module.exports = function(grunt) {
                 stderr: false
             },
             stats: {
-                command: "rm src/static/stats.txt;" +
-                    [
-                        "ls src/ -R1 | grep '^$' -v | grep ':$' -v | wc -l | xargs printf '%b\tsource files\n'",
-                        "find src/ -regex '.*\..*' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
-                        "du -hs src/ | pcregrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
+                command: "rm src/web/static/stats.txt;" +
+                [
+                    "ls src/ -R1 | grep '^$' -v | grep ':$' -v | wc -l | xargs printf '%b\tsource files\n'",
+                    "find src/ -regex '.*\..*' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
+                    "du -hs src/ | pcregrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
 
-                        "ls src/js/ -R1 | grep '\.js$' | wc -l | xargs printf '\n%b\tJavaScript source files\n'",
-                        "find src/js/ -regex '.*\.js' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
-                        "find src/js/ -regex '.*\.js' -exec du -hcs {} \+ | tail -n1 | egrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
+                    "find src/ -regex '.*\.js' -not -regex '.*/lib/.*' -print | wc -l | xargs printf '\n%b\tJavaScript source files\n'",
+                    "find src/ -regex '.*\.js' -not -regex '.*/lib/.*' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
+                    "find src/ -regex '.*\.js' -not -regex '.*/lib/.*' -exec du -hcs {} \+ | tail -n1 | egrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
 
-                        "find src/js/ -regex '.*/lib/.*\.js' -print | wc -l | xargs printf '\n%b\tthird party JavaScript source files\n'",
-                        "find src/js/ -regex '.*/lib/.*\.js' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
-                        "find src/js/ -regex '.*/lib/.*\.js' -exec du -hcs {} \+ | tail -n1 | egrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
+                    "du build/dev/scripts.js -h | egrep -o '^[^\t]*' | xargs printf '\n%b\tuncompressed JavaScript size\n'",
+                    "du build/prod/scripts.js -h | egrep -o '^[^\t]*' | xargs printf '%b\tcompressed JavaScript size\n'",
 
-                        "find src/js/ -regex '.*\.js' -not -regex '.*/lib/.*' -print | wc -l | xargs printf '\n%b\tfirst party JavaScript source files\n'",
-                        "find src/js/ -regex '.*\.js' -not -regex '.*/lib/.*' -print | xargs cat | wc -l | xargs printf '%b\tlines\n'",
-                        "find src/js/ -regex '.*\.js' -not -regex '.*/lib/.*' -exec du -hcs {} \+ | tail -n1 | egrep -o '^[^\t]*' | xargs printf '%b\tsize\n'",
+                    "grep -E '^\\s+name: ' src/core/config/Categories.js | wc -l | xargs printf '\n%b\tcategories\n'",
+                    "grep -E '^\\s+\"[A-Za-z0-9 \\-]+\": {' src/core/config/OperationConfig.js | wc -l | xargs printf '%b\toperations\n'",
 
-                        "du build/dev/scripts.js -h | egrep -o '^[^\t]*' | xargs printf '\n%b\tuncompressed JavaScript size\n'",
-                        "du build/prod/scripts.js -h | egrep -o '^[^\t]*' | xargs printf '%b\tcompressed JavaScript size\n'",
-
-                        "grep -E '^\\s+name: ' src/js/config/Categories.js | wc -l | xargs printf '\n%b\tcategories\n'",
-                        "grep -E '^\\s+\"[A-Za-z0-9 \\-]+\": {' src/js/config/OperationConfig.js | wc -l | xargs printf '%b\toperations\n'",
-
-                    ].join(" >> src/static/stats.txt;") + " >> src/static/stats.txt;",
+                ].join(" >> src/web/static/stats.txt;") + " >> src/web/static/stats.txt;",
                 stderr: false
             },
             displayStats: {
-                command: "cat src/static/stats.txt"
+                command: "cat src/web/static/stats.txt"
             },
             cleanGit: {
                 command: "git gc --prune=now --aggressive"
             },
             deployGhPages: {
                 command: [
-                        "git add build/prod/index.html -v",
-                        "COMMIT_HASH=$(git rev-parse HEAD)",
-                        "git commit -m \"GitHub Pages release for ${COMMIT_HASH}\"",
-                        "git push origin `git subtree split --prefix build/prod master`:gh-pages --force",
-                        "git reset HEAD~",
-                        "git checkout build/prod/index.html"
+                    "git add build/prod/index.html -v",
+                    "COMMIT_HASH=$(git rev-parse HEAD)",
+                    "git commit -m \"GitHub Pages release for ${COMMIT_HASH}\"",
+                    "git push origin `git subtree split --prefix build/prod master`:gh-pages --force",
+                    "git reset HEAD~",
+                    "git checkout build/prod/index.html"
                 ].join(";")
             }
         },
@@ -452,19 +443,19 @@ module.exports = function(grunt) {
         },
         watch: {
             css: {
-                files: ["src/css/**/*.css", "src/css/**/*.less"],
+                files: ["src/web/css/**/*.css", "src/web/css/**/*.less"],
                 tasks: ["webpack:web", "chmod:build"]
             },
             js: {
-                files: "src/js/**/*.js",
+                files: "src/**/*.js",
                 tasks: ["webpack:web", "chmod:build"]
             },
             html: {
-                files: "src/html/**/*.html",
+                files: "src/web/html/**/*.html",
                 tasks: ["copy:htmlDev", "chmod:build"]
             },
             static: {
-                files: ["src/static/**/*", "src/static/**/.*"],
+                files: ["src/web/static/**/*", "src/web/static/**/.*"],
                 tasks: ["copy:staticDev", "chmod:build"]
             },
             grunt: {

src/core/Recipe.js

@@ -220,4 +220,4 @@ Recipe.prototype.fromString = function(recipeStr) {
 
 // Required here to prevent circular dependency where Recipe returns an empty object
 // See http://stackoverflow.com/a/30390378
-var OperationConfig = require("../config/OperationConfig.js");
+var OperationConfig = require("./config/OperationConfig.js");

src/core/config/OperationConfig.js

@@ -1,4 +1,4 @@
-var FlowControl     = require("../core/FlowControl.js"),
+var FlowControl     = require("../FlowControl.js"),
     Base            = require("../operations/Base.js"),
     Base58          = require("../operations/Base58.js"),
     Base64          = require("../operations/Base64.js"),

src/core/lib/uas_parser.js

@@ -26,7 +26,7 @@
 */
 "use strict";
 
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 var UAS_parser = {
 	

src/core/operations/Base58.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/Base64.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/BitwiseOp.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     CryptoJS = require("crypto-js");
 
 

src/core/operations/ByteRepr.js

@@ -1,5 +1,5 @@
 /* globals app */
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/CharEnc.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     CryptoJS = require("crypto-js");
 
 

src/core/operations/Checksum.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/Cipher.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     CryptoJS = require("crypto-js"),
     Blowfish = require("sladex-blowfish");
 

src/core/operations/Code.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     VKbeautify = require("vkbeautify"),
     dom = require("xmldom").DOMParser,
     xpath = require("xpath"),

src/core/operations/Compress.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     rawdeflate = require("zlibjs/bin/rawdeflate.min"),
     rawinflate = require("zlibjs/bin/rawinflate.min"),
     zlibAndGzip = require("zlibjs/bin/zlib_and_gzip.min"),

src/core/operations/Endian.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/Entropy.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/FileType.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/HTML.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/Hash.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     CryptoJS = require("crypto-js"),
     CryptoApi = require("crypto-api"),
     Checksum = require("./Checksum.js");

src/core/operations/Hexdump.js

@@ -1,5 +1,5 @@
 /* globals app */
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/IP.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     Checksum = require("./Checksum.js"),
     BigInteger = require("jsbn").BigInteger;
 

src/core/operations/MorseCode.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/PublicKey.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     r = require("jsrsasign");
 
 

src/core/operations/SeqUtils.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/StrUtils.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js"),
+var Utils = require("../Utils.js"),
     JsDiff = require("diff");
 
 

src/core/operations/Tidy.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/URL.js

@@ -1,6 +1,5 @@
 /* globals unescape */
-
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/core/operations/Unicode.js

@@ -1,4 +1,4 @@
-var Utils = require("../core/Utils.js");
+var Utils = require("../Utils.js");
 
 
 /**

src/node/index.js

@@ -6,7 +6,7 @@
  * @license Apache-2.0
  */
 
-var Chef = require("../../core/Chef.js");
+var Chef = require("../core/Chef.js");
 
 module.exports = {
 

src/static/stats.txt

@@ -1,21 +0,0 @@
-214	source files
-115922	lines
-4.3M	size
-
-144	JavaScript source files
-106730	lines
-3.8M	size
-
-83	third party JavaScript source files
-86259	lines
-3.0M	size
-
-61	first party JavaScript source files
-20471	lines
-764K	size
-
-3.5M	uncompressed JavaScript size
-1.9M	compressed JavaScript size
-
-15	categories
-177	operations

src/web/ControlsWaiter.js

@@ -1,4 +1,4 @@
-var Utils = require("../../core/Utils.js");
+var Utils = require("../core/Utils.js");
 
 
 /**

src/web/HTMLApp.js

@@ -1,5 +1,5 @@
-var Utils = require("../../core/Utils.js"),
-    Chef = require("../../core/Chef.js"),
+var Utils = require("../core/Utils.js"),
+    Chef = require("../core/Chef.js"),
     Manager = require("./Manager.js"),
     HTMLCategory = require("./HTMLCategory.js"),
     HTMLOperation = require("./HTMLOperation.js"),

src/web/HighlighterWaiter.js

@@ -1,4 +1,4 @@
-var Utils = require("../../core/Utils.js");
+var Utils = require("../core/Utils.js");
 
 
 /**

src/web/InputWaiter.js

@@ -1,4 +1,4 @@
-var Utils = require("../../core/Utils.js");
+var Utils = require("../core/Utils.js");
 
 
 /**

src/web/OutputWaiter.js

@@ -1,4 +1,4 @@
-var Utils = require("../../core/Utils.js");
+var Utils = require("../core/Utils.js");
 
 
 /**

src/web/css/index.js

@@ -15,4 +15,4 @@ require("bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css");
 require("./structure/overrides.css");
 require("./structure/layout.css");
 require("./structure/utils.css");
-require("./themes/classic.css");
+require("./themes/classic.css");

src/web/index.js

@@ -5,9 +5,9 @@
  */
 
 var HTMLApp = require("./HTMLApp.js"),
-    Categories = require("../../config/Categories.js"),
-    OperationConfig = require("../../config/OperationConfig.js"),
-    CanvasComponents = require("../../lib/canvascomponents.js");
+    Categories = require("../core/config/Categories.js"),
+    OperationConfig = require("../core/config/OperationConfig.js"),
+    CanvasComponents = require("../core/lib/canvascomponents.js");
 
 /**
  * Main function used to build the CyberChef web app.