@node-red/util 2.1.4 → 2.2.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

package/lib/events.js

@@ -32,8 +32,14 @@ function wrapEventFunction(obj,func) {
     return function(eventName, listener) {
         if (deprecatedEvents.hasOwnProperty(eventName)) {
             const log = require("@node-red/util").log;
-            const stack = (new Error().stack).split("\n")[2].split("(")[1].slice(0,-1);
-            log.warn(`[RED.events] Deprecated use of "${eventName}" event from "${stack}". Use "${deprecatedEvents[eventName]}" instead.`)
+
+            const stack = (new Error().stack).split("\n");
+            let location = "(unknown)"
+            // See https://github.com/node-red/node-red/issues/3292
+            if (stack.length > 2) {
+                location = stack[2].split("(")[1].slice(0,-1);
+            }
+            log.warn(`[RED.events] Deprecated use of "${eventName}" event from "${location}". Use "${deprecatedEvents[eventName]}" instead.`)
         }
         return events["_"+func].call(events,eventName,listener)
     }

package/lib/util.js

@@ -522,6 +522,17 @@ function setObjectProperty(msg,prop,value,createMissing) {
  * @return {String} value of env var
  */
 function getSetting(node, name, flow_) {
+    if (node) {
+        if (name === "NR_NODE_NAME") {
+            return node.name;
+        }
+        if (name === "NR_NODE_ID") {
+            return node.id;
+        }
+        if (name === "NR_NODE_PATH") {
+            return node._path;
+        }
+    }
     var flow = (flow_ ? flow_ : (node ? node._flow : null));
     if (flow) {
         if (node && node.g) {
@@ -686,7 +697,7 @@ function prepareJSONataExpression(value,node) {
         return moment(arg1, arg2, arg3, arg4);
     });
     expr.registerFunction('clone', cloneMessage, '<(oa)-:o>');
-    expr._legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(value);
+    expr._legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(value);
     expr._node = node;
     return expr;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.1.4",
+    "version": "2.2.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -16,7 +16,7 @@
     ],
     "dependencies": {
         "fs-extra": "10.0.0",
-        "i18next": "21.5.4",
+        "i18next": "21.6.10",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.8.5",
         "lodash.clonedeep": "^4.5.0",