@node-red/runtime 2.1.3 → 2.1.4

package/lib/flows/Flow.js

@@ -439,8 +439,6 @@ class Flow {
                                 }
                             }
                             return [env.name, env];
-                            
-                            return [env.name, env];
                         });
                         group._env = Object.fromEntries(entries);
                     }
@@ -457,24 +455,24 @@ class Flow {
                                 const val
                                       = ((value === "true") ||
                                          (value === true));
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             if (type === "cred") {
-                                return {
+                                return [{
                                     val: value
-                                };
+                                }, null];
                             }
                             try {
                                 var val = redUtil.evaluateNodeProperty(value, type, node, null, null);
-                                return {
+                                return [{
                                     val: val
-                                };
+                                }, null];
                             }
                             catch (e) {
                                 this.error(e);
-                                return null;
+                                return [null, null];
                             }
                         }
                     }
@@ -488,7 +486,7 @@ class Flow {
                 return this.getGroupEnvSetting(node, parent, name);
             }
         }
-        return null;
+        return [null, name];
     }
 
 
@@ -545,6 +543,9 @@ class Flow {
                     }
                 }
             }
+            else {
+                key = key.substring(8);
+            }
         }
         return this.parent.getSetting(key);
     }

package/lib/flows/Subflow.js

@@ -373,10 +373,11 @@ class Subflow extends Flow {
         const node = this.subflowInstance;
         if (node.g) {
             const group = this.getGroupNode(node.g);
-            const result = this.getGroupEnvSetting(node, group, name);
+            const [result, newName] = this.getGroupEnvSetting(node, group, name);
             if (result) {
                 return result.val;
             }
+            name = newName;
         }
         
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.1.3",
-        "@node-red/util": "2.1.3",
+        "@node-red/registry": "2.1.4",
+        "@node-red/util": "2.1.4",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.1",