@node-red/util 3.1.6 → 4.0.0-beta.1

package/lib/util.js

@@ -636,7 +636,15 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
     } else if (type === 're') {
         result = new RegExp(value);
     } else if (type === 'date') {
-        result = Date.now();
+        if (!value) {
+            result = Date.now();
+        } else if (value === 'object') {
+            result = new Date()
+        } else if (value === 'iso') {
+            result = (new Date()).toISOString()
+        } else {
+            result = moment().format(value)
+        }
     } else if (type === 'bin') {
         var data = JSON.parse(value);
         if (Array.isArray(data) || (typeof(data) === "string")) {
@@ -769,12 +777,15 @@ 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)
+        const error = new Error('Calls to RED.util.evaluateJSONataExpression must include a callback.')
+        throw error
     }
-    return expr.evaluate(context, bindings, callback);
+
+    expr.evaluate(context, bindings).then(result => {
+        callback(null, result)
+    }).catch(err => {
+        callback(err)
+    })
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.6",
+    "version": "4.0.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -18,7 +18,7 @@
         "fs-extra": "11.1.1",
         "i18next": "21.10.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.6",
+        "jsonata": "2.0.4",
         "lodash.clonedeep": "^4.5.0",
         "moment": "2.29.4",
         "moment-timezone": "0.5.43"