frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Handle escape characters in template node which uses Mustache format and JSON output mode (#1377)

Browse Source 
* Handle escape characters in template node which uses Mustache format and JSON output mode

* Handle escape characters in template node which uses Mustache format and JSON output mode
This commit is contained in:
Kazuhito Yokoi 2017-09-21 21:38:45 +09:00 committed by Nick O'Leary
parent 6ce761edda
commit ef53dca062
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nodes/core/core/80-template.js
View File

@ -22,9 +22,10 @@ module.exports = function(RED) {
* Custom Mustache Context capable to resolve message property and node * Custom Mustache Context capable to resolve message property and node
* flow and global context * flow and global context
*/ */
function NodeContext(msg, nodeContext,parent) { function NodeContext(msg, nodeContext, parent, escapeStrings) {
this.msgContext = new mustache.Context(msg,parent); this.msgContext = new mustache.Context(msg,parent);
this.nodeContext = nodeContext; this.nodeContext = nodeContext;
this.escapeStrings = escapeStrings;
} }
NodeContext.prototype = new mustache.Context(); NodeContext.prototype = new mustache.Context();
@ -34,6 +35,14 @@ module.exports = function(RED) {
try { try {
var value = this.msgContext.lookup(name); var value = this.msgContext.lookup(name);
if (value !== undefined) { if (value !== undefined) {
if (this.escapeStrings && typeof value === "string") {
value = value.replace(/\\/g, "\\\\");
value = value.replace(/\n/g, "\\n");
value = value.replace(/\t/g, "\\t");
value = value.replace(/\r/g, "\\r");
value = value.replace(/\f/g, "\\f");
value = value.replace(/[\b]/g, "\\b");
}
return value; return value;
} }
@ -73,7 +82,11 @@ module.exports = function(RED) {
try { try {
var value; var value;
if (node.syntax === "mustache") { if (node.syntax === "mustache") {
value = mustache.render(node.template,new NodeContext(msg, node.context())); if (node.outputFormat === "json") {
value = mustache.render(node.template,new NodeContext(msg, node.context(), null, true));
} else {
value = mustache.render(node.template,new NodeContext(msg, node.context(), null, false));
}
} else { } else {
value = node.template; value = node.template;
} }

12
test/nodes/core/core/80-template_spec.js
View File

@ -88,6 +88,18 @@ describe('template node', function() {
}); });
}); });
it('should handle escape characters in Mustache format and JSON output mode', function(done) {
var flow = [{id:"n1", type:"template", field:"payload", syntax:"mustache", template:"{\"data\":\"{{payload}}\"}", output:"json", wires:[["n2"]]},{id:"n2",type:"helper"}];
helper.load(templateNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.payload.should.have.property('data', 'line\t1\nline\\2\r\nline\b3\f');
done();
});
n1.receive({payload:"line\t1\nline\\2\r\nline\b3\f"});
});
});
it('should modify payload in plain text mode', function(done) { it('should modify payload in plain text mode', function(done) {
var flow = [{id:"n1", type:"template", field:"payload", syntax:"plain", template:"payload={{payload}}",wires:[["n2"]]},{id:"n2",type:"helper"}]; var flow = [{id:"n1", type:"template", field:"payload", syntax:"plain", template:"payload={{payload}}",wires:[["n2"]]},{id:"n2",type:"helper"}];