@node-red/util 3.0.2 → 3.1.0-beta.2

package/lib/util.js

@@ -25,7 +25,7 @@ const moment = require("moment-timezone");
 const safeJSONStringify = require("json-stringify-safe");
 const util = require("util");
 const { hasOwnProperty } = Object.prototype;
-
+const log = require("./log")
 /**
  * Safely returns the object construtor name.
  * @return {String} the name of the object constructor if it exists, empty string otherwise.
@@ -671,8 +671,11 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
     } else if (type === 'bool') {
         result = /^true$/i.test(value);
     } else if (type === 'jsonata') {
-        var expr = prepareJSONataExpression(value,node);
-        result = evaluateJSONataExpression(expr,msg);
+        var expr = prepareJSONataExpression(value, node);
+        result = evaluateJSONataExpression(expr, msg, callback);
+        if (callback) {
+            return
+        }
     } else if (type === 'env') {
         result = evaluateEnvProperty(value, node);
     }
@@ -696,13 +699,19 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
 function prepareJSONataExpression(value,node) {
     var expr = jsonata(value);
     expr.assign('flowContext', function(val, store) {
-        return node.context().flow.get(val, store);
+        if (node) {
+            return node.context().flow.get(val, store);
+        }
+        return "";
     });
     expr.assign('globalContext', function(val, store) {
-        return node.context().global.get(val, store);
+        if (node) {
+            return node.context().global.get(val, store);
+        }
+        return "";
     });
     expr.assign('env', function(name) {
-        var val = getSetting(node, name, node._flow);
+        var val = getSetting(node, name, node ? node._flow : null);
         if (typeof val !== 'undefined') {
             return val;
         } else {
@@ -761,6 +770,11 @@ function evaluateJSONataExpression(expr,msg,callback) {
                 })
             });
         }
+    } else {
+        log.warn('Deprecated API warning: Calls to RED.util.evaluateJSONataExpression must include a callback. '+
+                 'This will not be optional in Node-RED 4.0. Please identify the node from the following stack '+
+                 'and check for an update on npm. If none is available, please notify the node author.')
+        log.warn(new Error().stack)
     }
     return expr.evaluate(context, bindings, callback);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.0.2",
+    "version": "3.1.0-beta.2",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -16,11 +16,11 @@
     ],
     "dependencies": {
         "fs-extra": "10.1.0",
-        "i18next": "21.8.16",
+        "i18next": "21.10.0",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
         "moment": "2.29.4",
-        "moment-timezone": "0.5.34"
+        "moment-timezone": "0.5.41"
     }
 }