From fca4ed70131c57915e0119539c7adcd86986dbf7 Mon Sep 17 00:00:00 2001
From: d98762625 <d98762625@gmail.com>
Date: Fri, 20 Apr 2018 10:55:17 +0100
Subject: [PATCH] simplified API

---
 src/node/Wrapper.mjs | 85 +++++++++++---------------------------------
 src/node/index.mjs   | 45 +++++++++--------------
 2 files changed, 37 insertions(+), 93 deletions(-)

diff --git a/src/node/Wrapper.mjs b/src/node/Wrapper.mjs
index 33f34b7b..66876295 100644
--- a/src/node/Wrapper.mjs
+++ b/src/node/Wrapper.mjs
@@ -10,68 +10,28 @@ import Dish from "../core/Dish";
 import log from "loglevel";
 
 /**
- * 
+ * Extract default arg value from operation argument
+ * @param {Object} arg - an arg from an operation
  */
-export default class Wrapper {
-
-    /**
-     * 
-     * @param arg 
-     */
-    extractArg(arg) {
-        if (arg.type === "option" || arg.type === "editableOption") {
-            return arg.value[0];
-        }
-
-        return arg.value;
+function extractArg(arg) {
+    if (arg.type === "option" || arg.type === "editableOption") {
+        return arg.value[0];
     }
 
+    return arg.value;
+}
+
+/**
+ * Wrap an operation to be consumed by node API.
+ * new Operation().run() becomes operation()
+ * @param Operation 
+ */
+export default function wrap(Operation) {
     /**
      * 
      */
-    wrap(operation) {
-        this.operation = new operation();
-        // This for just exposing run function:
-        // return this.run.bind(this);
-
-        /**
-         * 
-         * @param input 
-         * @param args 
-         */
-        const _run = async(input, args=null) => {
-            const dish = new Dish(input);
-
-            try {
-                dish.findType();
-            } catch (e) {
-                log.debug(e);
-            }
-    
-            if (!args) {
-                args = this.operation.args.map(this.extractArg);
-            } else {
-                // Allows single arg ops to have arg defined not in array
-                if (!(args instanceof Array)) {
-                    args = [args];
-                }
-            }
-            const transformedInput = await dish.get(Dish.typeEnum(this.operation.inputType));
-            return this.operation.innerRun(transformedInput, args);
-        };
-
-        // There's got to be a nicer way to do this!
-        this.operation.innerRun = this.operation.run;
-        this.operation.run = _run;
-
-        return this.operation;
-    }
-
-    /**
-     *
-     * @param input
-     */
-    async run(input, args = null) {
+    return async (input, args=null) => {
+        const operation = new Operation();
         const dish = new Dish(input);
 
         try {
@@ -81,19 +41,14 @@ export default class Wrapper {
         }
 
         if (!args) {
-            args = this.operation.args.map(this.extractArg);
+            args = operation.args.map(extractArg);
         } else {
             // Allows single arg ops to have arg defined not in array
             if (!(args instanceof Array)) {
                 args = [args];
             }
         }
-
-        const transformedInput = await dish.get(Dish.typeEnum(this.operation.inputType));
-        return this.operation.run(transformedInput, args);
-
-
-
-
-    }
+        const transformedInput = await dish.get(Dish.typeEnum(operation.inputType));
+        return operation.run(transformedInput, args);
+    };
 }
diff --git a/src/node/index.mjs b/src/node/index.mjs
index 3dfda7d7..8900fbd4 100644
--- a/src/node/index.mjs
+++ b/src/node/index.mjs
@@ -18,36 +18,25 @@ global.ENVIRONMENT_IS_WEB = function() {
     return typeof window === "object";
 };
 
-// import Chef from "../core/Chef";
 
-// const CyberChef = {
-
-//     bake: function(input, recipeConfig) {
-//         this.chef = new Chef();
-//         return this.chef.bake(
-//             input,
-//             recipeConfig,
-//             {},
-//             0,
-//             false
-//         );
-//     }
-
-// };
-
-// export default CyberChef;
-// export {CyberChef};
-
-import Wrapper from "./Wrapper";
+import wrap from "./Wrapper";
 
 import * as operations from "../core/operations/index";
 
-const cyberChef = {
-    base32: {
-        from: new Wrapper().wrap(operations.FromBase32),
-        to: new Wrapper().wrap(operations.ToBase32),
-    }
-};
+/**
+ * 
+ * @param name 
+ */
+function decapitalise(name) {
+    return `${name.charAt(0).toLowerCase()}${name.substr(1)}`;
+}
 
-export default cyberChef;
-export {cyberChef};
+
+// console.log(operations);
+const chef = {};
+Object.keys(operations).forEach(op =>
+    chef[decapitalise(op)] = wrap(operations[op]));
+
+
+export default chef;
+export {chef};