From 8eed2232ee895852b135c4e4ccd7d9198ba521d6 Mon Sep 17 00:00:00 2001
From: d98762625 <d98762625@gmail.com>
Date: Wed, 20 Mar 2019 11:57:47 +0000
Subject: [PATCH] add immutable presentAs method to Dish for node REPL display.
 add test for exact match help

---
 src/core/Dish.mjs            | 16 ++++++++++++++++
 src/node/File.mjs            |  9 +++++++--
 src/node/NodeDish.mjs        |  8 ++++----
 tests/node/tests/nodeApi.mjs | 21 ++++++++++++++++-----
 tests/operations/Dish.mjs    | 12 ++++++++++++
 5 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 tests/operations/Dish.mjs

diff --git a/src/core/Dish.mjs b/src/core/Dish.mjs
index 452be80d..d8c47d1f 100755
--- a/src/core/Dish.mjs
+++ b/src/core/Dish.mjs
@@ -184,6 +184,22 @@ class Dish {
         }
     }
 
+    /**
+     * Returns the Dish as the given type, without mutating the original dish.
+     *
+     * If running in a browser, get is asynchronous.
+     *
+     * @Node
+     *
+     * @param {number} type - The data type of value, see Dish enums.
+     * @param {boolean} [notUTF8=false] - Do not treat strings as UTF8.
+     * @returns {Dish | Promise} - (Broswer) A promise | (Node) value of dish in given type
+     */
+    presentAs(type, notUTF8=false) {
+        const clone = this.clone();
+        return clone.get(type, notUTF8);
+    }
+
 
     /**
      * Validates that the value is the type that has been specified.
diff --git a/src/node/File.mjs b/src/node/File.mjs
index 1d0234ae..0ecee7e5 100644
--- a/src/node/File.mjs
+++ b/src/node/File.mjs
@@ -21,12 +21,17 @@ class File {
      *
      * https://w3c.github.io/FileAPI/#file-constructor
      *
-     * @param {String|Array|ArrayBuffer|Buffer} bits - file content
+     * @param {String|Array|ArrayBuffer|Buffer|[File]} bits - file content
      * @param {String} name (optional) - file name
      * @param {Object} stats (optional) - file stats e.g. lastModified
      */
     constructor(data, name="", stats={}) {
-        const buffers = data.map(d => Buffer.from(d));
+        const buffers = data.map((d) => {
+            if (d instanceof File) {
+                return Buffer.from(d.data);
+            }
+            return Buffer.from(d);
+        });
         const totalLength = buffers.reduce((p, c) => p + c.length, 0);
         this.data = Buffer.concat(buffers, totalLength);
 
diff --git a/src/node/NodeDish.mjs b/src/node/NodeDish.mjs
index f619fdd8..21854643 100644
--- a/src/node/NodeDish.mjs
+++ b/src/node/NodeDish.mjs
@@ -53,14 +53,14 @@ class NodeDish extends Dish {
      * Avoid coercion to a String primitive.
      */
     toString() {
-        return this.get(Dish.typeEnum("string"));
+        return this.presentAs(Dish.typeEnum("string"));
     }
 
     /**
      * What we want to log to the console.
      */
     [util.inspect.custom](depth, options) {
-        return this.get(Dish.typeEnum("string"));
+        return this.presentAs(Dish.typeEnum("string"));
     }
 
     /**
@@ -68,14 +68,14 @@ class NodeDish extends Dish {
      * Log only the value to the console in node.
      */
     inspect() {
-        return this.get(Dish.typeEnum("string"));
+        return this.presentAs(Dish.typeEnum("string"));
     }
 
     /**
      * Avoid coercion to a Number primitive.
      */
     valueOf() {
-        return this.get(Dish.typeEnum("number"));
+        return this.presentAs(Dish.typeEnum("number"));
     }
 
 }
diff --git a/tests/node/tests/nodeApi.mjs b/tests/node/tests/nodeApi.mjs
index 2bd07231..55eea606 100644
--- a/tests/node/tests/nodeApi.mjs
+++ b/tests/node/tests/nodeApi.mjs
@@ -148,12 +148,23 @@ TestRegister.addApiTests([
     }),
 
     it("chef.help: lists name matches before desc matches", () => {
+        const result = chef.help("Checksum");
+        assert.ok(result[0].name.includes("Checksum"));
+        assert.ok(result[1].name.includes("Checksum"));
+        assert.strictEqual(result[result.length - 1].name.includes("Checksum"), false);
+        assert.ok(result[result.length - 1].description.includes("checksum"));
+    }),
+
+    it("chef.help: exact name match only returns one result", () => {
         const result = chef.help("MD5");
-        assert.ok(result[0].name.includes("MD5"));
-        assert.strictEqual(result[1].name.includes("MD5"), false);
-        assert.strictEqual(result[2].name.includes("MD5"), false);
-        assert.ok(result[1].description.includes("MD5"));
-        assert.ok(result[2].description.includes("MD5"));
+        assert.strictEqual(result.length, 1);
+        assert.strictEqual(result[0].name, "MD5");
+    }),
+
+    it("chef.help: exact match ignores whitespace", () => {
+        const result = chef.help("tobase64");
+        assert.strictEqual(result.length, 1);
+        assert.strictEqual(result[0].name, "To Base64");
     }),
 
     it("chef.bake: should exist", () => {
diff --git a/tests/operations/Dish.mjs b/tests/operations/Dish.mjs
new file mode 100644
index 00000000..9f5264f7
--- /dev/null
+++ b/tests/operations/Dish.mjs
@@ -0,0 +1,12 @@
+import TestRegister from "../../lib/TestRegister";
+import Dish from "../../src/core/Dish";
+import it from "../node/assertionHandler";
+import assert from "assert";
+
+TestRegister.addApiTests([
+    it("Dish - presentAs: should exist", () => {
+        const dish = new Dish();
+        assert(dish.presentAs);
+    }),
+
+]);