@node-red/util 2.0.3 → 2.1.0-beta.1

package/lib/i18n.js

@@ -23,7 +23,7 @@
 var i18n = require("i18next");
 
 var path = require("path");
-var fs = require("fs-extra");
+var fs = require("fs");
 
 var defaultLang = "en-US";
 
@@ -89,7 +89,7 @@ async function readFile(lng, ns) {
         return resourceCache[ns][lng];
     } else if (resourceMap[ns]) {
         const file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file);
-        const content = await fs.readFile(file, "utf8");
+        const content = await fs.promises.readFile(file, "utf8");
         resourceCache[ns] = resourceCache[ns] || {};
         resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, ''));
         var baseLng = lng.split('-')[0];
@@ -141,6 +141,7 @@ function init(settings) {
         initPromise = new Promise((resolve,reject) => {
             i18n.use(MessageFileLoader);
             var opt = {
+                compatibilityJSON: 'v3',
                 // debug: true,
                 defaultNS: "runtime",
                 ns: [],

package/lib/util.js

@@ -521,12 +521,17 @@ function setObjectProperty(msg,prop,value,createMissing) {
  * @param {String} name - name of variable
  * @return {String} value of env var
  */
-function getSetting(node, name) {
-    if (node && node._flow) {
-        var flow = node._flow;
-        if (flow) {
-            return flow.getSetting(name);
+function getSetting(node, name, flow_) {
+    var flow = (flow_ ? flow_ : (node ? node._flow : null));
+    if (flow) {
+        if (node && node.g) {
+            const group = flow.getGroupNode(node.g);
+            const result = flow.getGroupEnvSetting(node, group, name);
+            if (result) {
+                return result.val;
+            }
         }
+        return flow.getSetting(name);
     }
     return process.env[name];
 }
@@ -544,18 +549,19 @@ function getSetting(node, name) {
  * @memberof @node-red/util_util
  */
 function evaluateEnvProperty(value, node) {
+    var flow = (node && node.hasOwnProperty("_flow")) ? node._flow : null;
     var result;
     if (/^\${[^}]+}$/.test(value)) {
         // ${ENV_VAR}
         var name = value.substring(2,value.length-1);
-        result = getSetting(node, name);
+        result = getSetting(node, name, flow);
     } else if (!/\${\S+}/.test(value)) {
         // ENV_VAR
-        result = getSetting(node, value);
+        result = getSetting(node, value, flow);
     } else {
         // FOO${ENV_VAR}BAR
         return value.replace(/\${([^}]+)}/g, function(match, name) {
-            var val = getSetting(node, name);
+            var val = getSetting(node, name, flow);
             return (val === undefined)?"":val;
         });
     }
@@ -668,7 +674,7 @@ function prepareJSONataExpression(value,node) {
         return node.context().global.get(val, store);
     });
     expr.assign('env', function(name) {
-        var val = getSetting(node, name);
+        var val = getSetting(node, name, node._flow);
         if (typeof val !== 'undefined') {
             return val;
         } else {
@@ -976,5 +982,6 @@ module.exports = {
     normaliseNodeTypeName: normaliseNodeTypeName,
     prepareJSONataExpression: prepareJSONataExpression,
     evaluateJSONataExpression: evaluateJSONataExpression,
-    parseContextStore: parseContextStore
+    parseContextStore: parseContextStore,
+    getSetting: getSetting
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.0.3",
+    "version": "2.1.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -16,9 +16,9 @@
     ],
     "dependencies": {
         "fs-extra": "10.0.0",
-        "i18next": "20.3.2",
+        "i18next": "21.2.4",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.4",
+        "jsonata": "1.8.5",
         "lodash.clonedeep": "^4.5.0",
         "moment-timezone": "0.5.33"
     }