'Magic' operation - automatically detect and run operations

.eslintignore

@@ -1,2 +1,2 @@
 src/core/vendor/**
-src/core/operations/legacy/**
+src/core/operations/legacy/**

Gruntfile.js

@@ -380,6 +380,7 @@ module.exports = function (grunt) {
                 command: [
                     "echo '\n--- Regenerating config files. ---'",
                     "node --experimental-modules src/core/config/scripts/generateOpsIndex.mjs",
+                    "echo 'export default {};\n' > src/core/config/modules/OpModules.mjs",
                     "node --experimental-modules src/core/config/scripts/generateConfig.mjs",
                     "echo '--- Config scripts finished. ---\n'"
                 ].join(";")

package.json

@@ -77,6 +77,7 @@
     "bootstrap-colorpicker": "^2.5.2",
     "bootstrap-switch": "^3.3.4",
     "bson": "^2.0.6",
+    "chi-squared": "^1.1.0",
     "crypto-api": "^0.8.0",
     "crypto-js": "^3.1.9-1",
     "ctph.js": "0.0.5",

src/core/ChefWorker.js

@@ -91,7 +91,7 @@ self.addEventListener("message", function(e) {
  */
 async function bake(data) {
     // Ensure the relevant modules are loaded
-    loadRequiredModules(data.recipeConfig);
+    self.loadRequiredModules(data.recipeConfig);
 
     try {
         const response = await self.chef.bake(
@@ -144,25 +144,6 @@ async function getDishAs(data) {
 }
 
 
-/**
- * Checks that all required modules are loaded and loads them if not.
- *
- * @param {Object} recipeConfig
- */
-function loadRequiredModules(recipeConfig) {
-    recipeConfig.forEach(op => {
-        const module = self.OperationConfig[op.op].module;
-
-        if (!OpModules.hasOwnProperty(module)) {
-            log.info(`Loading ${module} module`);
-            self.sendStatusMessage(`Loading ${module} module`);
-            self.importScripts(`${self.docURL}/${module}.js`);
-            self.sendStatusMessage("");
-        }
-    });
-}
-
-
 /**
  * Calculates highlight offsets if possible.
  *
@@ -182,6 +163,25 @@ function calculateHighlights(recipeConfig, direction, pos) {
 }
 
 
+/**
+ * Checks that all required modules are loaded and loads them if not.
+ *
+ * @param {Object} recipeConfig
+ */
+self.loadRequiredModules = function(recipeConfig) {
+    recipeConfig.forEach(op => {
+        const module = self.OperationConfig[op.op].module;
+
+        if (!OpModules.hasOwnProperty(module)) {
+            log.info(`Loading ${module} module`);
+            self.sendStatusMessage(`Loading ${module} module`);
+            self.importScripts(`${self.docURL}/${module}.js`);
+            self.sendStatusMessage("");
+        }
+    });
+};
+
+
 /**
  * Send status update to the app.
  *

src/core/Operation.mjs

@@ -188,7 +188,7 @@ class Operation {
     get config() {
         return {
             "op": this.name,
-            "args": this._ingList.map(ing => ing.conf)
+            "args": this._ingList.map(ing => ing.config)
         };
     }
 
@@ -274,6 +274,15 @@ class Operation {
         return this._flowControl;
     }
 
+    /**
+     * Set whether this Operation is a flowcontrol op.
+     *
+     * @param {boolean} value
+     */
+    set flowControl(value) {
+        this._flowControl = !!value;
+    }
+
 }
 
 export default Operation;

src/core/Recipe.mjs

@@ -172,9 +172,9 @@ class Recipe  {
                     numRegisters = state.numRegisters;
                 } else {
                     output = await op.run(input, op.ingValues);
-                    this.lastRunOp = op;
                     dish.set(output, op.outputType);
                 }
+                this.lastRunOp = op;
             } catch (err) {
                 // Return expected errors as output
                 if (err instanceof OperationError ||

src/core/Utils.mjs

@@ -720,7 +720,7 @@ class Utils {
      * @param {boolean} [newline=false] - whether to add a newline after each operation
      * @returns {string}
      */
-    static generatePrettyRecipe(recipeConfig, newline=false) {
+    static generatePrettyRecipe(recipeConfig, newline = false) {
         let prettyConfig = "",
             name = "",
             args = "",

src/core/config/Categories.json

@@ -338,6 +338,7 @@
     {
         "name": "Flow control",
         "ops": [
+            "Magic",
             "Fork",
             "Merge",
             "Register",

src/core/config/scripts/generateConfig.mjs

@@ -43,6 +43,10 @@ for (const opObj in Ops) {
         args: op.args
     };
 
+    if (op.hasOwnProperty("patterns")) {
+        operationConfig[op.name].patterns = op.patterns;
+    }
+
     if (!modules.hasOwnProperty(op.module))
         modules[op.module] = {};
     modules[op.module][op.name] = opObj;