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

update handling of invalid jsonata expression

Browse Source
This commit is contained in:
Hiroyasu Nishiyama
2020-05-11 14:51:47 +09:00
parent d6ad7dc6eb
commit 00e080459e
4 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/node_modules/@node-red/nodes/core/common/20-inject.js vendored
View File

@@ -45,6 +45,19 @@ module.exports = function(RED) {
this.cronjob = null;
var node = this;
node.props.forEach(function (prop) {
if (prop.vt === "jsonata") {
try {
var val = prop.v ? prop.v : "";
prop.exp = RED.util.prepareJSONataExpression(val, node);
}
catch (err) {
node.error(RED._("inject.errors.invalid-expr", {error:err.message}));
prop.exp = null;
}
}
});
if (node.repeat > 2147483) {
node.error(RED._("inject.errors.toolong", this));
delete node.repeat;
@@ -86,10 +99,22 @@ module.exports = function(RED) {
if (!property) return;
if (valueType === "jsonata") {
if (p.exp) {
try {
var val = RED.util.evaluateJSONataExpression(p.exp, msg);
RED.util.setMessageProperty(msg, property, val, true);
}
catch (err) {
errors.push(err.message);
}
}
return;
}
try {
RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
} catch (err) {
errors.push(err);
errors.push(err.toString());
}
});

3
packages/node_modules/@node-red/nodes/locales/en-US/messages.json vendored
View File

@@ -83,7 +83,8 @@
"success": "Successfully injected: __label__",
"errors": {
"failed": "inject failed, see log for details",
"toolong": "Interval too large"
"toolong": "Interval too large",
"invalid-expr": "Invalid JSONata expression: __error__"
}
},
"catch": {

3
packages/node_modules/@node-red/nodes/locales/ja/messages.json vendored
View File

@@ -83,7 +83,8 @@
"success": "inject処理を実行しました: __label__",
"errors": {
"failed": "inject処理が失敗しました。詳細はログを確認してください。",
"toolong": "時間間隔が大き過ぎます"
"toolong": "時間間隔が大き過ぎます",
"invalid-expr": "JSONata式が不正: __error__"
}
},
"catch": {