From 3c4f4d27d60cd65aa5768ca329b9741b34672c9c Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 1 Dec 2018 18:03:04 +0100
Subject: [PATCH 1/4] Support output editting of DEBUG node using JSONata

---
 .../@node-red/nodes/core/core/58-debug.html   | 22 +++++
 .../@node-red/nodes/core/core/58-debug.js     | 81 +++++++++++++------
 .../nodes/locales/en-US/core/58-debug.html    |  1 +
 .../nodes/locales/en-US/messages.json         |  3 +
 .../nodes/locales/ja/core/58-debug.html       |  1 +
 .../@node-red/nodes/locales/ja/messages.json  |  3 +
 test/nodes/core/core/58-debug_spec.js         | 32 ++++++++
 7 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.html b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
index 3e603253b..59a356af2 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
@@ -5,6 +5,14 @@
         <input id="node-input-typed-complete" type="text" style="width: 70%">
         <input id="node-input-complete" type="hidden">
     </div>
+
+    <div class="form-row">
+        <label for="node-input-edit"><i class="fa fa-calculator"></i> <span data-i18n="debug.edit"></span></label>
+        <input type="text" id="node-input-edit" style="width:70%;">
+        <input type="hidden" id="node-input-editType">
+    </div>
+
+
     <div class="form-row">
         <label for="node-input-tosidebar"><i class="fa fa-random"></i> <span data-i18n="debug.to"></span></label>
         <label for="node-input-tosidebar" style="width:70%">
@@ -38,6 +46,8 @@
         category: 'output',
         defaults: {
             name: {value:""},
+            edit: {value:""},
+            editType: {value:"none"},
             active: {value:true},
             tosidebar: {value:true},
             console: {value:false},
@@ -245,6 +255,18 @@
             delete RED._debug;
         },
         oneditprepare: function() {
+            var none = {
+                value: "none",
+                label: RED._("node-red:debug.none"),
+                hasValue: false
+            };
+            $("#node-input-edit").typedInput({
+                default: 'none',
+                typeField: $("#node-input-editType"),
+                types:[none, 'jsonata']
+            });
+            $("#node-input-edit").change();
+
             if (this.tosidebar === undefined) {
                 this.tosidebar = true;
                 $("#node-input-tosidebar").prop('checked', true);
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
index 9d8d0675b..c425e798f 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
@@ -1,4 +1,3 @@
-
 module.exports = function(RED) {
     "use strict";
     var util = require("util");
@@ -8,6 +7,23 @@ module.exports = function(RED) {
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
 
+    function editValue(exp, val) {
+        return new Promise((resolve, reject) => {
+            if (exp) {
+                RED.util.evaluateJSONataExpression(exp, val, (err, value) => {
+                    if (err) {
+                        reject(RED._("debug.invalid-exp", {error: edit_exp}));
+                    } else {
+                        resolve(value);
+                    }
+                });
+            }
+            else {
+                resolve(val);
+            }
+        });
+    }
+
     function DebugNode(n) {
         RED.nodes.createNode(this,n);
         this.name = n.name;
@@ -43,16 +59,29 @@ module.exports = function(RED) {
             "50": "green",
             "60": "blue"
         };
+        var edit = null;
+        if (n.editType === "jsonata") {
+            var edit_exp = n.edit;
+            try {
+                edit = RED.util.prepareJSONataExpression(edit_exp, this);
+            }
+            catch (e) {
+                node.error(RED._("debug.invalid-exp", {error: edit_exp}));
+                return;
+            }
+        }
 
         this.on("input",function(msg) {
             if (this.complete === "true") {
                 // debug complete msg object
-                if (this.console === "true") {
-                    node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
-                }
-                if (this.active && this.tosidebar) {
-                    sendDebug({id:node.id, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
-                }
+                editValue(edit, msg).then(val => {
+                    if (this.console === "true") {
+                        node.log("\n"+util.inspect(val, {colors:useColors, depth:10}));
+                    }
+                    if (this.active && this.tosidebar) {
+                        sendDebug({id:node.id, name:node.name, topic:val.topic, msg:val, _path:val._path});
+                    }
+                });
             }
             else {
                 // debug user defined msg property
@@ -66,26 +95,28 @@ module.exports = function(RED) {
                         output = undefined;
                     }
                 }
-                if (this.console === "true") {
-                    if (typeof output === "string") {
-                        node.log((output.indexOf("\n") !== -1 ? "\n" : "") + output);
-                    } else if (typeof output === "object") {
-                        node.log("\n"+util.inspect(output, {colors:useColors, depth:10}));
-                    } else {
-                        node.log(util.inspect(output, {colors:useColors}));
+                editValue(edit, output).then(val => {
+                    if (this.console === "true") {
+                        if (typeof val === "string") {
+                            node.log((val.indexOf("\n") !== -1 ? "\n" : "") + val);
+                        } else if (typeof val === "object") {
+                            node.log("\n"+util.inspect(val, {colors:useColors, depth:10}));
+                        } else {
+                            node.log(util.inspect(val, {colors:useColors}));
+                        }
                     }
-                }
-                if (this.tostatus === true) {
-                    var st = util.inspect(output);
-                    var severity = node.severity;
-                    if (st.length > 32) { st = st.substr(0,32) + "..."; }
-                    node.status({fill:colors[severity], shape:"dot", text:st});
-                }
-                if (this.active) {
-                    if (this.tosidebar == true) {
-                        sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:output, _path:msg._path});
+                    if (this.tostatus === true) {
+                        var st = util.inspect(val);
+                        var severity = node.severity;
+                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                        node.status({fill:colors[severity], shape:"dot", text:st});
                     }
-                }
+                    if (this.active) {
+                        if (this.tosidebar == true) {
+                            sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:val, _path:msg._path});
+                        }
+                    }
+                });
             }
         });
     }
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
index 38a5b7de8..5e33112ca 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
@@ -23,4 +23,5 @@
        Clicking on the source node id will reveal that node within the workspace.</p>
     <p>The button on the node can be used to enable or disable its output. It is recommended to disable or remove any Debug nodes that are not being used.</p>
     <p>The node can also be configured to send all messages to the runtime log, or to send short (32 characters) to the status text under the debug node.</p>
+    <p>Output of this node can be edited using JSONata expression by specifying the expression on <b>Edit</b> field.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index a6c6e1da2..cd4b6170b 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -103,6 +103,9 @@
     },
     "debug": {
         "output": "Output",
+        "edit": "Edit",
+        "none": "None",
+        "invalid-exp": "Invalid JSONata expression: __error__",
         "msgprop": "message property",
         "msgobj": "complete msg object",
         "to": "To",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
index 614eb1547..c72475d8a 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
@@ -22,5 +22,6 @@
     <p>メッセージを受信した時刻、送信ノード、メッセージの型に関する情報を「デバッグ」サイドバーに表示されたメッセージに付随して表示します。送信元ノードのIDを選択すると、ワークスペース内の対応ノードを確認できます。</p>
     <p>出力の有効/無効はノード上のボタンで切り替えられます。フロー上で未使用のdebugノードは、無効化するか削除することを推奨します。</p>
     <p>全てのメッセージをランタイムログに送付、もしくは、(32文字の)短いデータをdebugノードの下のステータステキストに表示することも可能です。</p>
+    <p>このノードの出力は、JSONata式を<b>編集</b>フィールドに指定することで変更できます。</p>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index df3974aac..1178d349f 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -103,6 +103,9 @@
     },
     "debug": {
         "output": "対象",
+        "edit": "編集",
+        "none": "無し",
+        "invalid-exp": "JSONata式が不正: __error__",
         "msgprop": "メッセージプロパティ",
         "msgobj": "msgオブジェクト全体",
         "to": "出力先",
diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/core/58-debug_spec.js
index c35d7017e..a5a992c92 100644
--- a/test/nodes/core/core/58-debug_spec.js
+++ b/test/nodes/core/core/58-debug_spec.js
@@ -356,6 +356,38 @@ describe('debug node', function() {
         });
     });
 
+    it('should publish payload with edit', function(done) {
+        var flow = [{id:"n1", type:"debug", name:"Debug",
+                     editType: "jsonata", edit: '"<" & $ & ">"'}];
+        helper.load(debugNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            websocket_test(function() {
+                n1.emit("input", {payload:"test"});
+            }, function(msg) {
+                JSON.parse(msg).should.eql([{
+                    topic:"debug",data:{id:"n1",name:"Debug",msg:"<test>",
+                    format:"string[6]",property:"payload"}
+                }]);
+            }, done);
+        });
+    });
+
+    it('should publish complete message with edit', function(done) {
+        var flow = [{id:"n1", type:"debug", name:"Debug", complete: "true",
+                     editType: "jsonata", edit: '"<" & payload & ">"'}];
+        helper.load(debugNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            websocket_test(function() {
+                n1.emit("input", {payload:"test"});
+            }, function(msg) {
+                JSON.parse(msg).should.eql([{
+                    topic:"debug",data:{id:"n1",name:"Debug",msg:"<test>",
+                    format:"string[6]"}
+                }]);
+            }, done);
+        });
+    });
+
     it('should truncate a long message', function(done) {
         var flow = [{id:"n1", type:"debug" }];
         helper.load(debugNode, flow, function() {

From 8198132ca7d28209dd2f6c02c862a1fb4d55083c Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 9 Dec 2018 20:30:35 +0900
Subject: [PATCH 2/4] use output selector for specifying JSONata expression

---
 .../@node-red/nodes/core/core/58-debug.html   |  40 ++++---
 .../@node-red/nodes/core/core/58-debug.js     | 112 ++++++++++--------
 test/nodes/core/core/58-debug_spec.js         |  18 +--
 3 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.html b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
index 59a356af2..a367bce0b 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
@@ -4,15 +4,9 @@
         <label for="node-input-typed-complete"><i class="fa fa-list"></i> <span data-i18n="debug.output"></span></label>
         <input id="node-input-typed-complete" type="text" style="width: 70%">
         <input id="node-input-complete" type="hidden">
+        <input id="node-input-targetType" type="hidden">
     </div>
 
-    <div class="form-row">
-        <label for="node-input-edit"><i class="fa fa-calculator"></i> <span data-i18n="debug.edit"></span></label>
-        <input type="text" id="node-input-edit" style="width:70%;">
-        <input type="hidden" id="node-input-editType">
-    </div>
-
-
     <div class="form-row">
         <label for="node-input-tosidebar"><i class="fa fa-random"></i> <span data-i18n="debug.to"></span></label>
         <label for="node-input-tosidebar" style="width:70%">
@@ -46,17 +40,19 @@
         category: 'output',
         defaults: {
             name: {value:""},
-            edit: {value:""},
-            editType: {value:"none"},
             active: {value:true},
             tosidebar: {value:true},
             console: {value:false},
             tostatus: {value:false},
-            complete: {value:"false", required:true}
+            complete: {value:"false", required:true},
+            targetType: {value:undefined}
         },
         label: function() {
             var suffix = "";
             if (this.console === true || this.console === "true") { suffix = " ⇲"; }
+            if (this.targetType === "jsonata") {
+                return (this.name || "JSONata") + suffix;
+            }
             if (this.complete === true || this.complete === "true") {
                 return (this.name||"msg") + suffix;
             } else {
@@ -260,13 +256,6 @@
                 label: RED._("node-red:debug.none"),
                 hasValue: false
             };
-            $("#node-input-edit").typedInput({
-                default: 'none',
-                typeField: $("#node-input-editType"),
-                types:[none, 'jsonata']
-            });
-            $("#node-input-edit").change();
-
             if (this.tosidebar === undefined) {
                 this.tosidebar = true;
                 $("#node-input-tosidebar").prop('checked', true);
@@ -276,8 +265,21 @@
                 $("#node-input-console").prop('checked', this.console);
                 $("#node-input-tosidebar").prop('checked', true);
             }
-            $("#node-input-typed-complete").typedInput({types:['msg', {value:"full",label:RED._("node-red:debug.msgobj"),hasValue:false}]});
-            if (this.complete === "true" || this.complete === true) {
+            var fullType = {
+                value: "full",
+                label: RED._("node-red:debug.msgobj"),
+                hasValue: false
+            };
+            $("#node-input-typed-complete").typedInput({
+                default: "msg",
+                types:['msg', fullType, "jsonata"],
+                typeField: $("#node-input-targetType")
+            });
+            if (this.targetType === "jsonata") {
+                var property = this.complete || "";
+                $("#node-input-typed-complete").typedInput('type','jsonata');
+                $("#node-input-typed-complete").typedInput('value',property);
+            } else if ((this.targetType === "full") || this.complete === "true" || this.complete === true) {
                 // show complete message object
                 $("#node-input-typed-complete").typedInput('type','full');
             } else {
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
index c425e798f..43b24fb39 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
@@ -7,27 +7,12 @@ module.exports = function(RED) {
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
 
-    function editValue(exp, val) {
-        return new Promise((resolve, reject) => {
-            if (exp) {
-                RED.util.evaluateJSONataExpression(exp, val, (err, value) => {
-                    if (err) {
-                        reject(RED._("debug.invalid-exp", {error: edit_exp}));
-                    } else {
-                        resolve(value);
-                    }
-                });
-            }
-            else {
-                resolve(val);
-            }
-        });
-    }
-
     function DebugNode(n) {
+        var is_edit = (n.targetType === "jsonata");
+        var edit_exp = is_edit ? n.complete : null;
         RED.nodes.createNode(this,n);
         this.name = n.name;
-        this.complete = (n.complete||"payload").toString();
+        this.complete = is_edit ? null : (n.complete||"payload").toString();
         if (this.complete === "false") { this.complete = "payload"; }
         this.console = ""+(n.console || false);
         this.tostatus = n.tostatus || false;
@@ -60,8 +45,7 @@ module.exports = function(RED) {
             "60": "blue"
         };
         var edit = null;
-        if (n.editType === "jsonata") {
-            var edit_exp = n.edit;
+        if (edit_exp) {
             try {
                 edit = RED.util.prepareJSONataExpression(edit_exp, this);
             }
@@ -70,18 +54,46 @@ module.exports = function(RED) {
                 return;
             }
         }
+        
+        function editValue(exp, val) {
+            return new Promise((resolve, reject) => {
+                if (exp) {
+                    RED.util.evaluateJSONataExpression(exp, val, (err, value) => {
+                        if (err) {
+                            reject(RED._("debug.invalid-exp", {error: edit_exp}));
+                        } else {
+                            resolve(value);
+                        }
+                    });
+                }
+                else {
+                    resolve(val);
+                }
+            });
+        }
 
-        this.on("input",function(msg) {
+        function output_e(msg) {
+            editValue(edit, msg).then(val => {
+                if (this.console === "true") {
+                    node.log("\n"+util.inspect(val, {colors:useColors, depth:10}));
+                }
+                if (this.active && this.tosidebar) {
+                    sendDebug({id:node.id, name:node.name, topic:val.topic, msg:val, _path:val._path});
+                }
+            }).catch(err => {
+                node.error(err);
+            });
+        }
+
+        function output(msg) {
             if (this.complete === "true") {
                 // debug complete msg object
-                editValue(edit, msg).then(val => {
-                    if (this.console === "true") {
-                        node.log("\n"+util.inspect(val, {colors:useColors, depth:10}));
-                    }
-                    if (this.active && this.tosidebar) {
-                        sendDebug({id:node.id, name:node.name, topic:val.topic, msg:val, _path:val._path});
-                    }
-                });
+                if (this.console === "true") {
+                    node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
+                }
+                if (this.active && this.tosidebar) {
+                    sendDebug({id:node.id, name:node.name, topic:msg.topic, msg:msg, _path:msg._path});
+                }
             }
             else {
                 // debug user defined msg property
@@ -95,30 +107,30 @@ module.exports = function(RED) {
                         output = undefined;
                     }
                 }
-                editValue(edit, output).then(val => {
-                    if (this.console === "true") {
-                        if (typeof val === "string") {
-                            node.log((val.indexOf("\n") !== -1 ? "\n" : "") + val);
-                        } else if (typeof val === "object") {
-                            node.log("\n"+util.inspect(val, {colors:useColors, depth:10}));
-                        } else {
-                            node.log(util.inspect(val, {colors:useColors}));
-                        }
+                if (this.console === "true") {
+                    if (typeof output === "string") {
+                        node.log((output.indexOf("\n") !== -1 ? "\n" : "") + output);
+                    } else if (typeof output === "object") {
+                        node.log("\n"+util.inspect(output, {colors:useColors, depth:10}));
+                    } else {
+                        node.log(util.inspect(output, {colors:useColors}));
                     }
-                    if (this.tostatus === true) {
-                        var st = util.inspect(val);
-                        var severity = node.severity;
-                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
-                        node.status({fill:colors[severity], shape:"dot", text:st});
+                }
+                if (this.tostatus === true) {
+                    var st = util.inspect(output);
+                    var severity = node.severity;
+                    if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                    node.status({fill:colors[severity], shape:"dot", text:st});
+                }
+                if (this.active) {
+                    if (this.tosidebar == true) {
+                        sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:output, _path:msg._path});
                     }
-                    if (this.active) {
-                        if (this.tosidebar == true) {
-                            sendDebug({id:node.id, z:node.z, name:node.name, topic:msg.topic, property:property, msg:val, _path:msg._path});
-                        }
-                    }
-                });
+                }
             }
-        });
+        }
+        
+        this.on("input", (edit_exp ? output_e : output));
     }
 
     RED.nodes.registerType("debug",DebugNode, {
diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/core/58-debug_spec.js
index a5a992c92..1ae55062f 100644
--- a/test/nodes/core/core/58-debug_spec.js
+++ b/test/nodes/core/core/58-debug_spec.js
@@ -356,25 +356,9 @@ describe('debug node', function() {
         });
     });
 
-    it('should publish payload with edit', function(done) {
-        var flow = [{id:"n1", type:"debug", name:"Debug",
-                     editType: "jsonata", edit: '"<" & $ & ">"'}];
-        helper.load(debugNode, flow, function() {
-            var n1 = helper.getNode("n1");
-            websocket_test(function() {
-                n1.emit("input", {payload:"test"});
-            }, function(msg) {
-                JSON.parse(msg).should.eql([{
-                    topic:"debug",data:{id:"n1",name:"Debug",msg:"<test>",
-                    format:"string[6]",property:"payload"}
-                }]);
-            }, done);
-        });
-    });
-
     it('should publish complete message with edit', function(done) {
         var flow = [{id:"n1", type:"debug", name:"Debug", complete: "true",
-                     editType: "jsonata", edit: '"<" & payload & ">"'}];
+                     targetType: "jsonata", complete: '"<" & payload & ">"'}];
         helper.load(debugNode, flow, function() {
             var n1 = helper.getNode("n1");
             websocket_test(function() {

From 8c367bcc53b4e4ba765d137af887b9c4d4f8d296 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sun, 9 Dec 2018 20:33:58 +0900
Subject: [PATCH 3/4] update messages

---
 .../@node-red/nodes/locales/en-US/core/58-debug.html            | 2 +-
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 1 -
 .../node_modules/@node-red/nodes/locales/ja/core/58-debug.html  | 2 +-
 packages/node_modules/@node-red/nodes/locales/ja/messages.json  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
index 5e33112ca..8ef14bca9 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
@@ -23,5 +23,5 @@
        Clicking on the source node id will reveal that node within the workspace.</p>
     <p>The button on the node can be used to enable or disable its output. It is recommended to disable or remove any Debug nodes that are not being used.</p>
     <p>The node can also be configured to send all messages to the runtime log, or to send short (32 characters) to the status text under the debug node.</p>
-    <p>Output of this node can be edited using JSONata expression by specifying the expression on <b>Edit</b> field.</p>
+    <p>Output of this node can be edited using JSONata expression by specifying the expression on <b>Output</b> field.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 6dd78417c..d7a05b2af 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -103,7 +103,6 @@
     },
     "debug": {
         "output": "Output",
-        "edit": "Edit",
         "none": "None",
         "invalid-exp": "Invalid JSONata expression: __error__",
         "msgprop": "message property",
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
index c72475d8a..33d512732 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
@@ -22,6 +22,6 @@
     <p>メッセージを受信した時刻、送信ノード、メッセージの型に関する情報を「デバッグ」サイドバーに表示されたメッセージに付随して表示します。送信元ノードのIDを選択すると、ワークスペース内の対応ノードを確認できます。</p>
     <p>出力の有効/無効はノード上のボタンで切り替えられます。フロー上で未使用のdebugノードは、無効化するか削除することを推奨します。</p>
     <p>全てのメッセージをランタイムログに送付、もしくは、(32文字の)短いデータをdebugノードの下のステータステキストに表示することも可能です。</p>
-    <p>このノードの出力は、JSONata式を<b>編集</b>フィールドに指定することで変更できます。</p>
+    <p>このノードの出力は、JSONata式を<b>対象</b>フィールドに指定することで変更できます。</p>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index d19ed15c6..bdc8f66a4 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -103,7 +103,6 @@
     },
     "debug": {
         "output": "対象",
-        "edit": "編集",
         "none": "無し",
         "invalid-exp": "JSONata式が不正: __error__",
         "msgprop": "メッセージプロパティ",

From 633b9180d7fb8154c91bb4f8a034311c8cb1dc4f Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Tue, 11 Dec 2018 19:53:10 +0900
Subject: [PATCH 4/4] update info text

---
 .../@node-red/nodes/locales/en-US/core/58-debug.html           | 3 +--
 .../node_modules/@node-red/nodes/locales/ja/core/58-debug.html | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
index 8ef14bca9..fe9017ff9 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/core/58-debug.html
@@ -15,7 +15,7 @@
 -->
 
 <script type="text/x-red" data-help-name="debug">
-    <p>Displays selected message properties in the debug sidebar tab and optionally the runtime log. By default it displays <code>msg.payload</code>.</p>
+    <p>Displays selected message properties in the debug sidebar tab and optionally the runtime log. By default it displays <code>msg.payload</code>, but can be configured to display any property, the full message or the result of a JSONata expression.</p>
     <h3>Details</h3>
     <p>The debug sidebar provides a structured view of the messages it is sent, making it easier to understand their structure.</p>
     <p>JavaScript objects and arrays can be collapsed and expanded as required. Buffer objects can be displayed as raw data or as a string if possible.</p>
@@ -23,5 +23,4 @@
        Clicking on the source node id will reveal that node within the workspace.</p>
     <p>The button on the node can be used to enable or disable its output. It is recommended to disable or remove any Debug nodes that are not being used.</p>
     <p>The node can also be configured to send all messages to the runtime log, or to send short (32 characters) to the status text under the debug node.</p>
-    <p>Output of this node can be edited using JSONata expression by specifying the expression on <b>Output</b> field.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
index 33d512732..13c097644 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/core/58-debug.html
@@ -15,13 +15,12 @@
 -->
 
 <script type="text/x-red" data-help-name="debug">
-    <p>サイドバーの「デバッグ」タブに、選択したメッセージプロパティの値を表示します。設定により、ランタイムログへの出力も可能です。デフォルトの表示対象は<code>msg.payload</code>です。</p>
+    <p>サイドバーの「デバッグ」タブに、選択したメッセージプロパティの値を表示します。設定により、ランタイムログへの出力も可能です。デフォルトの表示対象は<code>msg.payload</code>ですが、設定により、指定したプロパティ、メッセージ全体、もしくは、JSONata式の評価結果を出力できます。</p>
     <h3>詳細</h3>
     <p>「デバッグ」サイドバーは受け取ったメッセージの階層構造を表示する機能を備えます。この機能によりメッセージの構造を容易に理解できます。</p>
     <p>JavaScriptオブジェクトと配列は必要に応じて折り畳んだり展開したりできます。バッファオブジェクトを生データとして表示したり、表現可能な場合に文字列として表示したりすることも可能です。</p>
     <p>メッセージを受信した時刻、送信ノード、メッセージの型に関する情報を「デバッグ」サイドバーに表示されたメッセージに付随して表示します。送信元ノードのIDを選択すると、ワークスペース内の対応ノードを確認できます。</p>
     <p>出力の有効/無効はノード上のボタンで切り替えられます。フロー上で未使用のdebugノードは、無効化するか削除することを推奨します。</p>
     <p>全てのメッセージをランタイムログに送付、もしくは、(32文字の)短いデータをdebugノードの下のステータステキストに表示することも可能です。</p>
-    <p>このノードの出力は、JSONata式を<b>対象</b>フィールドに指定することで変更できます。</p>
 </script>