frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into master

Browse Source
This commit is contained in:
Nick O'Leary
2020-04-01 20:22:25 +01:00
committed by GitHub
parent 14c2005bbc 5da89892b4
commit e0f3e94e2b
404 changed files with 14036 additions and 2635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/node_modules/@node-red/util/lib/util.js vendored
View File

@@ -80,23 +80,25 @@ function ensureBuffer(o) {
* @memberof @node-red/util_util
*/
function cloneMessage(msg) {
// Temporary fix for #97
// TODO: remove this http-node-specific fix somehow
var req = msg.req;
var res = msg.res;
delete msg.req;
delete msg.res;
var m = clonedeep(msg);
if (req) {
m.req = req;
msg.req = req;
if (typeof msg !== "undefined") {
// Temporary fix for #97
// TODO: remove this http-node-specific fix somehow
var req = msg.req;
var res = msg.res;
delete msg.req;
delete msg.res;
var m = clonedeep(msg);
if (req) {
m.req = req;
msg.req = req;
}
if (res) {
m.res = res;
msg.res = res;
}
return m;
}
if (res) {
m.res = res;
msg.res = res;
}
return m;
return msg;
}
/**
@@ -555,15 +557,19 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
*/
function prepareJSONataExpression(value,node) {
var expr = jsonata(value);
expr.assign('flowContext',function(val) {
return node.context().flow.get(val);
expr.assign('flowContext',function(val, store) {
return node.context().flow.get(val, store);
});
expr.assign('globalContext',function(val) {
return node.context().global.get(val);
expr.assign('globalContext',function(val, store) {
return node.context().global.get(val, store);
});
expr.assign('env', function(name) {
var val = getSetting(node, name);
return (val ? val : "");
if (typeof val !== 'undefined') {
return val;
} else {
return ""
}
})
expr.registerFunction('clone', cloneMessage, '<(oa)-:o>');
expr._legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(value);