@node-red/runtime 3.1.0-beta.2 → 3.1.0-beta.4

package/lib/flows/util.js

@@ -13,23 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var clone = require("clone");
-var redUtil = require("@node-red/util").util;
-var Log = require("@node-red/util").log;
-var subflowInstanceRE = /^subflow:(.+)$/;
-var typeRegistry = require("@node-red/registry");
-const credentials = require("../nodes/credentials");
+const clone = require("clone");
+const redUtil = require("@node-red/util").util;
+const Log = require("@node-red/util").log;
+const typeRegistry = require("@node-red/registry");
+const subflowInstanceRE = /^subflow:(.+)$/;
 
 let _runtime = null;
+let envVarExcludes = {};
 
-var envVarExcludes = {};
+function init(runtime) {
+    _runtime = runtime;
+    envVarExcludes = {};
+    if (runtime.settings.hasOwnProperty('envVarExcludes') && Array.isArray(runtime.settings.envVarExcludes)) {
+        runtime.settings.envVarExcludes.forEach(v => envVarExcludes[v] = true);
+    }
+}
 
 function diffNodes(oldNode,newNode) {
     if (oldNode == null) {
         return true;
     }
-    var oldKeys = Object.keys(oldNode).filter(function(p) { return p != "x" && p != "y" && p != "wires" });
-    var newKeys = Object.keys(newNode).filter(function(p) { return p != "x" && p != "y" && p != "wires" });
+    const keyFilter = p => p != 'x' && p != 'y' && p != 'wires'
+    const groupKeyFilter = p => keyFilter(p) && p != 'nodes' && p != 'style' && p != 'w' && p != 'h'
+    var oldKeys = Object.keys(oldNode).filter(oldNode.type === 'group' ? groupKeyFilter : keyFilter);
+    var newKeys = Object.keys(newNode).filter(newNode.type === 'group' ? groupKeyFilter : keyFilter);
+
     if (oldKeys.length != newKeys.length) {
         return true;
     }
@@ -70,8 +79,64 @@ function mapEnvVarProperties(obj,prop,flow,config) {
     }
 }
 
+async function evaluateEnvProperties(flow, env, credentials) {
+    const pendingEvaluations = []
+    const evaluatedEnv = {}
+    const envTypes = []
+    for (let i = 0; i < env.length; i++) {
+        let { name, value, type } = env[i]
+        if (type === "env") {
+            // Do env types last as they may include references to other env vars
+            // at this level which need to be resolved before they can be looked-up
+            envTypes.push(env[i])
+        } else if (type === "bool") {
+            value = (value === "true") || (value === true);
+        } else if (type === "cred") {
+            if (credentials.hasOwnProperty(name)) {
+                value = credentials[name];
+            }
+        } else if (type ==='jsonata') {
+            pendingEvaluations.push(new Promise((resolve, _) => {
+                redUtil.evaluateNodeProperty(value, 'jsonata', {_flow: flow}, null, (err, result) => {
+                    if (!err) {
+                        evaluatedEnv[name] = result
+                    }
+                    resolve()
+                });
+            }))
+        } else {
+            value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
+        }
+        evaluatedEnv[name] = value
+    }
+    if (pendingEvaluations.length > 0) {
+        await Promise.all(pendingEvaluations)
+    }
+    for (let i = 0; i < envTypes.length; i++) {
+        let { name, value, type } = envTypes[i]
+        // If an env-var wants to lookup itself, delegate straight to the parent
+        // https://github.com/node-red/node-red/issues/2099
+        if (value === name) {
+            value = `$parent.${name}`
+        }
+        if (evaluatedEnv.hasOwnProperty(value)) {
+            value = evaluatedEnv[value]
+        } else {
+            value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
+        }
+        evaluatedEnv[name] = value
+    }
+
+    return evaluatedEnv
+}
 
-function createNode(flow,config) {
+/**
+ * Create a new instance of a node
+ * @param  {Flow} flow     The containing flow
+ * @param  {object} config The node configuration object
+ * @return {Node}          The instance of the node
+ */
+async function createNode(flow,config) {
     var newNode = null;
     var type = config.type;
     try {
@@ -140,7 +205,7 @@ function createNode(flow,config) {
             // This allows nodes inside the subflow to get ahold of each other
             // such as a node accessing its config node
             flow.subflowInstanceNodes[config.id] = subflow
-            subflow.start();
+            await subflow.start();
             return subflow.node;
         }
     } catch(err) {
@@ -150,373 +215,343 @@ function createNode(flow,config) {
 }
 
 function parseConfig(config) {
-   var flow = {};
-   flow.allNodes = {};
-   flow.subflows = {};
-   flow.configs = {};
-   flow.flows = {};
-   flow.groups = {};
-   flow.missingTypes = [];
-
-   config.forEach(function(n) {
-       flow.allNodes[n.id] = clone(n);
-       if (n.type === 'tab') {
-           flow.flows[n.id] = n;
-           flow.flows[n.id].subflows = {};
-           flow.flows[n.id].configs = {};
-           flow.flows[n.id].nodes = {};
-       }
-       if (n.type === 'group') {
-           flow.groups[n.id] = n;
-       }
-   });
-
-   // TODO: why a separate forEach? this can be merged with above
-   config.forEach(function(n) {
-       if (n.type === 'subflow') {
-           flow.subflows[n.id] = n;
-           flow.subflows[n.id].configs = {};
-           flow.subflows[n.id].nodes = {};
-           flow.subflows[n.id].instances = [];
-       }
-   });
-   var linkWires = {};
-   var linkOutNodes = [];
-   config.forEach(function(n) {
-       if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
-           var subflowDetails = subflowInstanceRE.exec(n.type);
-
-           if ( (subflowDetails && !flow.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(n.type)) ) {
-               if (flow.missingTypes.indexOf(n.type) === -1) {
-                   flow.missingTypes.push(n.type);
-               }
-           }
-           var container = null;
-           if (flow.flows[n.z]) {
-               container = flow.flows[n.z];
-           } else if (flow.subflows[n.z]) {
-               container = flow.subflows[n.z];
-           }
-           if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
-               if (subflowDetails) {
-                   var subflowType = subflowDetails[1]
-                   n.subflow = subflowType;
-                   flow.subflows[subflowType].instances.push(n)
-               }
-               if (container) {
-                   container.nodes[n.id] = n;
-               }
-           } else {
-               if (container) {
-                   container.configs[n.id] = n;
-               } else {
-                   flow.configs[n.id] = n;
-                   flow.configs[n.id]._users = [];
-               }
-           }
-           if (n.type === 'link in' && n.links) {
-               // Ensure wires are present in corresponding link out nodes
-               n.links.forEach(function(id) {
-                   linkWires[id] = linkWires[id]||{};
-                   linkWires[id][n.id] = true;
-               })
-           } else if (n.type === 'link out' && n.links) {
-               linkWires[n.id] = linkWires[n.id]||{};
-               n.links.forEach(function(id) {
-                   linkWires[n.id][id] = true;
-               })
-               linkOutNodes.push(n);
-           }
-       }
-   });
-   linkOutNodes.forEach(function(n) {
-       var links = linkWires[n.id];
-       var targets = Object.keys(links);
-       n.wires = [targets];
-   });
-
-
-   var addedTabs = {};
-   config.forEach(function(n) {
-       if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
-           for (var prop in n) {
-               if (n.hasOwnProperty(prop) && prop !== 'id' && prop !== 'wires' && prop !== 'type' && prop !== '_users' && flow.configs.hasOwnProperty(n[prop])) {
-                   // This property references a global config node
-                   flow.configs[n[prop]]._users.push(n.id)
-               }
-           }
-           if (n.z && !flow.subflows[n.z]) {
-
-               if (!flow.flows[n.z]) {
-                   flow.flows[n.z] = {type:'tab',id:n.z};
-                   flow.flows[n.z].subflows = {};
-                   flow.flows[n.z].configs = {};
-                   flow.flows[n.z].nodes = {};
-                   addedTabs[n.z] = flow.flows[n.z];
-               }
-               if (addedTabs[n.z]) {
-                   if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
-                       addedTabs[n.z].nodes[n.id] = n;
-                   } else {
-                       addedTabs[n.z].configs[n.id] = n;
-                   }
-               }
-           }
-       }
-   });
-   return flow;
-}
+    var flow = {};
+    flow.allNodes = {};
+    flow.subflows = {};
+    flow.configs = {};
+    flow.flows = {};
+    flow.missingTypes = [];
+
+    config.forEach(function (n) {
+        flow.allNodes[n.id] = clone(n);
+        if (n.type === 'tab') {
+            flow.flows[n.id] = n;
+            flow.flows[n.id].subflows = {};
+            flow.flows[n.id].configs = {};
+            flow.flows[n.id].nodes = {};
+            flow.flows[n.id].groups = {};
+        } else if (n.type === 'subflow') {
+            flow.subflows[n.id] = n;
+            flow.subflows[n.id].configs = {};
+            flow.subflows[n.id].nodes = {};
+            flow.subflows[n.id].groups = {};
+            flow.subflows[n.id].instances = [];
+        }
+    });
 
-function getGlobalEnv(name) {
-    const nodes = _runtime.nodes;
-    if (!nodes) {
-        return null;
-    }
-    const gconf = nodes.getGlobalConfig();
-    const env = gconf ? gconf.env : null;
-
-    if (env) {
-        const cred = (gconf ? credentials.get(gconf.id) : null) || {
-            map: {}
-        };
-        const map = cred.map;
-
-        for (let i = 0; i < env.length; i++) {
-            const item = env[i];
-            if (item.name === name) {
-                if (item.type === "cred") {
-                    return {
-                        name: name,
-                        value: map[name],
-                        type: "cred"
-                    };
+    var linkWires = {};
+    var linkOutNodes = [];
+    config.forEach(function (n) {
+        if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
+            var subflowDetails = subflowInstanceRE.exec(n.type);
+
+            if ((subflowDetails && !flow.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(n.type))) {
+                if (flow.missingTypes.indexOf(n.type) === -1) {
+                    flow.missingTypes.push(n.type);
                 }
-                return item;
             }
-        }
-    }
-    return null;
-}
-
-module.exports = {
-    init: function(runtime) {
-        _runtime = runtime;
-        envVarExcludes = {};
-        if (runtime.settings.hasOwnProperty('envVarExcludes') && Array.isArray(runtime.settings.envVarExcludes)) {
-            runtime.settings.envVarExcludes.forEach(v => envVarExcludes[v] = true);
-        }
-    },
-    getEnvVar: function(k) {
-        if (!envVarExcludes[k]) {
-            const item = getGlobalEnv(k);
-            if (item) {
-                const val = redUtil.evaluateNodeProperty(item.value, item.type, null, null, null);
-                return val;
+            var container = null;
+            if (flow.flows[n.z]) {
+                container = flow.flows[n.z];
+            } else if (flow.subflows[n.z]) {
+                container = flow.subflows[n.z];
             }
-            return process.env[k];
-        }
-        return undefined;
-    },
-    diffNodes: diffNodes,
-    mapEnvVarProperties: mapEnvVarProperties,
-
-    parseConfig: parseConfig,
-
-    diffConfigs: function(oldConfig, newConfig) {
-        var id;
-        var node;
-        var nn;
-        var wires;
-        var j,k;
-
-        if (!oldConfig) {
-            oldConfig = {
-                flows:{},
-                allNodes:{}
+            if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
+                if (subflowDetails) {
+                    var subflowType = subflowDetails[1]
+                    n.subflow = subflowType;
+                    if (flow.subflows[subflowType]) {
+                        flow.subflows[subflowType].instances.push(n)
+                    }
+                }
+                if (container) {
+                    container.nodes[n.id] = n;
+                }
+            } else {
+                if (container) {
+                    container.configs[n.id] = n;
+                } else {
+                    flow.configs[n.id] = n;
+                    flow.configs[n.id]._users = [];
+                }
             }
-        }
-        var changedSubflows = {};
-
-        var added = {};
-        var removed = {};
-        var changed = {};
-        var wiringChanged = {};
-
-        var linkMap = {};
-
-        var changedTabs = {};
-
-        // Look for tabs that have been removed
-        for (id in oldConfig.flows) {
-            if (oldConfig.flows.hasOwnProperty(id) && (!newConfig.flows.hasOwnProperty(id))) {
-                removed[id] = oldConfig.allNodes[id];
+            if (n.type === 'link in' && n.links) {
+                // Ensure wires are present in corresponding link out nodes
+                n.links.forEach(function (id) {
+                    linkWires[id] = linkWires[id] || {};
+                    linkWires[id][n.id] = true;
+                })
+            } else if (n.type === 'link out' && n.links) {
+                linkWires[n.id] = linkWires[n.id] || {};
+                n.links.forEach(function (id) {
+                    linkWires[n.id][id] = true;
+                })
+                linkOutNodes.push(n);
+            }
+        } else if (n.type === 'group') {
+            const parentContainer = flow.flows[n.z] || flow.subflows[n.z]
+            if (parentContainer) {
+                parentContainer.groups[n.id] = n
             }
         }
-
-        // Look for tabs that have been disabled
-        for (id in oldConfig.flows) {
-            if (oldConfig.flows.hasOwnProperty(id) && newConfig.flows.hasOwnProperty(id)) {
-                var originalState = oldConfig.flows[id].disabled||false;
-                var newState = newConfig.flows[id].disabled||false;
-                if (originalState !== newState) {
-                    changedTabs[id] = true;
-                    if (originalState) {
-                        added[id] = oldConfig.allNodes[id];
+    });
+    linkOutNodes.forEach(function (n) {
+        var links = linkWires[n.id];
+        var targets = Object.keys(links);
+        n.wires = [targets];
+    });
+
+
+    var addedTabs = {};
+    config.forEach(function (n) {
+        if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
+            for (var prop in n) {
+                if (n.hasOwnProperty(prop) && prop !== 'id' && prop !== 'wires' && prop !== 'type' && prop !== '_users' && flow.configs.hasOwnProperty(n[prop])) {
+                    // This property references a global config node
+                    flow.configs[n[prop]]._users.push(n.id)
+                }
+            }
+            if (n.z && !flow.subflows[n.z]) {
+
+                if (!flow.flows[n.z]) {
+                    flow.flows[n.z] = { type: 'tab', id: n.z };
+                    flow.flows[n.z].subflows = {};
+                    flow.flows[n.z].configs = {};
+                    flow.flows[n.z].nodes = {};
+                    addedTabs[n.z] = flow.flows[n.z];
+                }
+                if (addedTabs[n.z]) {
+                    if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
+                        addedTabs[n.z].nodes[n.id] = n;
                     } else {
-                        removed[id] = oldConfig.allNodes[id];
+                        addedTabs[n.z].configs[n.id] = n;
                     }
                 }
             }
         }
+    });
+    return flow;
+}
+function getEnvVar(k) {
+    if (!envVarExcludes[k]) {
+        return process.env[k];
+    }
+    return undefined;
+}
+function diffConfigs(oldConfig, newConfig) {
+    var id;
+    var node;
+    var nn;
+    var wires;
+    var j,k;
+
+    if (!oldConfig) {
+        oldConfig = {
+            flows:{},
+            allNodes:{}
+        }
+    }
+    var changedSubflows = {};
+
+    var added = {};
+    var removed = {};
+    var changed = {};
+    var flowChanged = {};
+    var wiringChanged = {};
+    var globalConfigChanged = false;
+    var linkMap = {};
+    var allNestedGroups = []
+
+    // Look for tabs that have been removed
+    for (id in oldConfig.flows) {
+        if (oldConfig.flows.hasOwnProperty(id) && (!newConfig.flows.hasOwnProperty(id))) {
+            removed[id] = oldConfig.allNodes[id];
+        }
+    }
 
-        for (id in oldConfig.allNodes) {
-            if (oldConfig.allNodes.hasOwnProperty(id)) {
-                node = oldConfig.allNodes[id];
-                if (node.type !== 'tab') {
-                    // build the map of what this node was previously wired to
-                    if (node.wires) {
-                        linkMap[node.id] = linkMap[node.id] || [];
-                        for (j=0;j<node.wires.length;j++) {
-                            wires = node.wires[j];
-                            for (k=0;k<wires.length;k++) {
-                                linkMap[node.id].push(wires[k]);
-                                nn = oldConfig.allNodes[wires[k]];
-                                if (nn) {
-                                    linkMap[nn.id] = linkMap[nn.id] || [];
-                                    linkMap[nn.id].push(node.id);
-                                }
+    // Look for tabs that have been disabled
+    for (id in oldConfig.flows) {
+        if (oldConfig.flows.hasOwnProperty(id) && newConfig.flows.hasOwnProperty(id)) {
+            var originalState = oldConfig.flows[id].disabled||false;
+            var newState = newConfig.flows[id].disabled||false;
+            if (originalState !== newState) {
+                if (originalState) {
+                    added[id] = oldConfig.allNodes[id];
+                } else {
+                    removed[id] = oldConfig.allNodes[id];
+                }
+            }
+        }
+    }
+
+    for (id in oldConfig.allNodes) {
+        if (oldConfig.allNodes.hasOwnProperty(id)) {
+            node = oldConfig.allNodes[id];
+            if (node.type !== 'tab') {
+                // build the map of what this node was previously wired to
+                if (node.wires) {
+                    linkMap[node.id] = linkMap[node.id] || [];
+                    for (j=0;j<node.wires.length;j++) {
+                        wires = node.wires[j];
+                        for (k=0;k<wires.length;k++) {
+                            linkMap[node.id].push(wires[k]);
+                            nn = oldConfig.allNodes[wires[k]];
+                            if (nn) {
+                                linkMap[nn.id] = linkMap[nn.id] || [];
+                                linkMap[nn.id].push(node.id);
                             }
                         }
                     }
-                    // This node has been removed or its flow disabled
-                    if (removed[node.z] || !newConfig.allNodes.hasOwnProperty(id)) {
-                        removed[id] = node;
-                        // Mark the container as changed
-                        if (!removed[node.z] && newConfig.allNodes[removed[id].z]) {
-                            changed[removed[id].z] = newConfig.allNodes[removed[id].z];
-                            if (changed[removed[id].z].type === "subflow") {
-                                changedSubflows[removed[id].z] = changed[removed[id].z];
-                                //delete removed[id];
-                            }
+                }
+                // This node has been removed or its flow disabled
+                if (removed[node.z] || !newConfig.allNodes.hasOwnProperty(id)) {
+                    removed[id] = node;
+                    // Mark the container as changed
+                    if (!removed[node.z] && newConfig.allNodes[removed[id].z]) {
+                        changed[removed[id].z] = newConfig.allNodes[removed[id].z];
+                        if (changed[removed[id].z].type === "subflow") {
+                            changedSubflows[removed[id].z] = changed[removed[id].z];
+                            //delete removed[id];
                         }
+                    }
+                } else {
+                    if (added[node.z]) {
+                        added[id] = node;
                     } else {
-                        if (added[node.z]) {
-                            added[id] = node;
-                        } else {
-                            var currentState = node.d;
-                            var newState = newConfig.allNodes[id].d;
-                            if (!currentState && newState) {
-                                removed[id] = node;
+                        var currentState = node.d;
+                        var newState = newConfig.allNodes[id].d;
+                        if (!currentState && newState) {
+                            removed[id] = node;
+                        }
+                        // This node has a material configuration change
+                        if (diffNodes(node,newConfig.allNodes[id]) || newConfig.allNodes[id].credentials) {
+                            changed[id] = newConfig.allNodes[id];
+                            if (changed[id].type === "subflow") {
+                                changedSubflows[id] = changed[id];
                             }
-                            // This node has a material configuration change
-                            if (diffNodes(node,newConfig.allNodes[id]) || newConfig.allNodes[id].credentials) {
-                                changed[id] = newConfig.allNodes[id];
-                                if (changed[id].type === "subflow") {
-                                    changedSubflows[id] = changed[id];
-                                }
-                                // Mark the container as changed
-                                if (newConfig.allNodes[changed[id].z]) {
-                                    changed[changed[id].z] = newConfig.allNodes[changed[id].z];
-                                    if (changed[changed[id].z].type === "subflow") {
-                                        changedSubflows[changed[id].z] = changed[changed[id].z];
-                                        delete changed[id];
-                                    }
+                            // Mark the container as changed
+                            if (newConfig.allNodes[changed[id].z]) {
+                                changed[changed[id].z] = newConfig.allNodes[changed[id].z];
+                                if (changed[changed[id].z].type === "subflow") {
+                                    changedSubflows[changed[id].z] = changed[changed[id].z];
+                                    delete changed[id];
                                 }
                             }
-                            // This node's wiring has changed
-                            if (!redUtil.compareObjects(node.wires,newConfig.allNodes[id].wires)) {
-                                wiringChanged[id] = newConfig.allNodes[id];
-                                // Mark the container as changed
-                                if (newConfig.allNodes[wiringChanged[id].z]) {
-                                    changed[wiringChanged[id].z] = newConfig.allNodes[wiringChanged[id].z];
-                                    if (changed[wiringChanged[id].z].type === "subflow") {
-                                        changedSubflows[wiringChanged[id].z] = changed[wiringChanged[id].z];
-                                        delete wiringChanged[id];
-                                    }
+                            if (newConfig.allNodes[id].type === 'global-config') {
+                                globalConfigChanged = true
+                            }
+                        }
+                        // This node's wiring has changed
+                        if (!redUtil.compareObjects(node.wires,newConfig.allNodes[id].wires)) {
+                            wiringChanged[id] = newConfig.allNodes[id];
+                            // Mark the container as changed
+                            if (newConfig.allNodes[wiringChanged[id].z]) {
+                                changed[wiringChanged[id].z] = newConfig.allNodes[wiringChanged[id].z];
+                                if (changed[wiringChanged[id].z].type === "subflow") {
+                                    changedSubflows[wiringChanged[id].z] = changed[wiringChanged[id].z];
+                                    delete wiringChanged[id];
                                 }
                             }
                         }
                     }
                 }
+            } else if (!removed[id]) {
+                if (JSON.stringify(node.env) !== JSON.stringify(newConfig.allNodes[id].env)) {
+                    flowChanged[id] = newConfig.allNodes[id];
+                }
             }
         }
-        // Look for added nodes
-        for (id in newConfig.allNodes) {
-            if (newConfig.allNodes.hasOwnProperty(id)) {
-                node = newConfig.allNodes[id];
-                // build the map of what this node is now wired to
-                if (node.wires) {
-                    linkMap[node.id] = linkMap[node.id] || [];
-                    for (j=0;j<node.wires.length;j++) {
-                        wires = node.wires[j];
-                        for (k=0;k<wires.length;k++) {
-                            if (linkMap[node.id].indexOf(wires[k]) === -1) {
-                                linkMap[node.id].push(wires[k]);
+    }
+    // Look for added nodes
+    for (id in newConfig.allNodes) {
+        if (newConfig.allNodes.hasOwnProperty(id)) {
+            node = newConfig.allNodes[id];
+            if (node.type === 'group') {
+                if (node.g) {
+                    allNestedGroups.push(node)
+                }
+                if (changed[node.id]) {
+                    if (node.nodes) {
+                        node.nodes.forEach(nid => {
+                            if (!changed[nid]) {
+                                changed[nid] = true
                             }
-                            nn = newConfig.allNodes[wires[k]];
-                            if (nn) {
-                                linkMap[nn.id] = linkMap[nn.id] || [];
-                                if (linkMap[nn.id].indexOf(node.id) === -1) {
-                                    linkMap[nn.id].push(node.id);
-                                }
+                        })
+                    }
+                }
+            }
+            // build the map of what this node is now wired to
+            if (node.wires) {
+                linkMap[node.id] = linkMap[node.id] || [];
+                for (j=0;j<node.wires.length;j++) {
+                    wires = node.wires[j];
+                    for (k=0;k<wires.length;k++) {
+                        if (linkMap[node.id].indexOf(wires[k]) === -1) {
+                            linkMap[node.id].push(wires[k]);
+                        }
+                        nn = newConfig.allNodes[wires[k]];
+                        if (nn) {
+                            linkMap[nn.id] = linkMap[nn.id] || [];
+                            if (linkMap[nn.id].indexOf(node.id) === -1) {
+                                linkMap[nn.id].push(node.id);
                             }
                         }
                     }
                 }
-                // This node has been added
-                if (!oldConfig.allNodes.hasOwnProperty(id)) {
-                    added[id] = node;
-                    // Mark the container as changed
-                    if (newConfig.allNodes[added[id].z]) {
-                        changed[added[id].z] = newConfig.allNodes[added[id].z];
-                        if (changed[added[id].z].type === "subflow") {
-                            changedSubflows[added[id].z] = changed[added[id].z];
-                            delete added[id];
-                        }
+            }
+            // This node has been added
+            if (!oldConfig.allNodes.hasOwnProperty(id)) {
+                added[id] = node;
+                // Mark the container as changed
+                if (newConfig.allNodes[added[id].z]) {
+                    changed[added[id].z] = newConfig.allNodes[added[id].z];
+                    if (changed[added[id].z].type === "subflow") {
+                        changedSubflows[added[id].z] = changed[added[id].z];
+                        delete added[id];
                     }
                 }
             }
         }
+    }
 
-        var madeChange;
-        // Loop through the nodes looking for references to changed config nodes
-        // Repeat the loop if anything is marked as changed as it may need to be
-        // propagated to parent nodes.
-        // TODO: looping through all nodes every time is a bit inefficient - could be more targeted
-        do {
-            madeChange = false;
-            for (id in newConfig.allNodes) {
-                if (newConfig.allNodes.hasOwnProperty(id)) {
-                    node = newConfig.allNodes[id];
-                    for (var prop in node) {
-                        if (node.hasOwnProperty(prop) && prop != "z" && prop != "id" && prop != "wires") {
-                            // This node has a property that references a changed/removed node
-                            // Assume it is a config node change and mark this node as
-                            // changed.
-
-                            var changeOrigin = changed[node[prop]];
-                            if (changeOrigin || removed[node[prop]]) {
-                                if (!changed[node.id]) {
-                                    if (changeOrigin &&
-                                        (prop === "g") &&
-                                        (changeOrigin.type === "group")) {
-                                        var oldNode = oldConfig.allNodes[node.id];
-                                        // ignore change of group node
-                                        // if group of this node not changed
-                                        if (oldNode &&
-                                            (node.g === oldNode.g)) {
-                                            continue;
-                                        }
+    var madeChange;
+    // Loop through the nodes looking for references to changed config nodes
+    // Repeat the loop if anything is marked as changed as it may need to be
+    // propagated to parent nodes.
+    // TODO: looping through all nodes every time is a bit inefficient - could be more targeted
+    do {
+        madeChange = false;
+        for (id in newConfig.allNodes) {
+            if (newConfig.allNodes.hasOwnProperty(id)) {
+                node = newConfig.allNodes[id];
+                for (var prop in node) {
+                    if (node.hasOwnProperty(prop) && prop != "z" && prop != "id" && prop != "wires") {
+                        // This node has a property that references a changed/removed node
+                        // Assume it is a config node change and mark this node as
+                        // changed.
+
+                        var changeOrigin = changed[node[prop]];
+                        if (changeOrigin || removed[node[prop]]) {
+                            if (!changed[node.id]) {
+                                if (changeOrigin &&
+                                    (prop === "g") &&
+                                    (changeOrigin.type === "group")) {
+                                    var oldNode = oldConfig.allNodes[node.id];
+                                    // ignore change of group node
+                                    // if group of this node not changed
+                                    if (oldNode &&
+                                        (node.g === oldNode.g)) {
+                                        continue;
                                     }
-                                    madeChange = true;
-                                    changed[node.id] = node;
-                                    // This node exists within subflow template
-                                    // Mark the template as having changed
-                                    if (newConfig.allNodes[node.z]) {
-                                        changed[node.z] = newConfig.allNodes[node.z];
-                                        if (changed[node.z].type === "subflow") {
-                                            changedSubflows[node.z] = changed[node.z];
-                                        }
+                                }
+                                madeChange = true;
+                                changed[node.id] = node;
+                                // This node exists within subflow template
+                                // Mark the template as having changed
+                                if (newConfig.allNodes[node.z]) {
+                                    changed[node.z] = newConfig.allNodes[node.z];
+                                    if (changed[node.z].type === "subflow") {
+                                        changedSubflows[node.z] = changed[node.z];
                                     }
                                 }
                             }
@@ -524,94 +559,123 @@ module.exports = {
                     }
                 }
             }
-        } while (madeChange===true)
+        }
+    } while (madeChange===true)
+
+    // Find any nodes that exist on a subflow template and remove from changed
+    // list as the parent subflow will now be marked as containing a change
+    for (id in newConfig.allNodes) {
+        if (newConfig.allNodes.hasOwnProperty(id)) {
+            node = newConfig.allNodes[id];
+            if (newConfig.allNodes[node.z] && newConfig.allNodes[node.z].type === "subflow") {
+                delete changed[node.id];
+            }
+        }
+    }
 
-        // Find any nodes that exist on a subflow template and remove from changed
-        // list as the parent subflow will now be marked as containing a change
-        for (id in newConfig.allNodes) {
-            if (newConfig.allNodes.hasOwnProperty(id)) {
-                node = newConfig.allNodes[id];
-                if (newConfig.allNodes[node.z] && newConfig.allNodes[node.z].type === "subflow") {
-                    delete changed[node.id];
-                }
+    // Recursively mark all children of changed groups as changed
+    do {
+        madeChange = false
+        for (let i = 0; i < allNestedGroups.length; i++) {
+            const group = allNestedGroups[i]
+            if (!changed[group.id] && group.g && changed[group.g]) {
+                changed[group.id] = true
+                madeChange = true
+            }
+            if (changed[group.id] && group.nodes) {
+                group.nodes.forEach(nid => {
+                    if (!changed[nid]) {
+                        changed[nid] = true
+                        madeChange = true
+                    }
+                })
             }
         }
+    } while(madeChange)
 
-        // Recursively mark all instances of changed subflows as changed
-        var changedSubflowStack = Object.keys(changedSubflows);
-        while (changedSubflowStack.length > 0) {
-            var subflowId = changedSubflowStack.pop();
-            for (id in newConfig.allNodes) {
-                if (newConfig.allNodes.hasOwnProperty(id)) {
-                    node = newConfig.allNodes[id];
-                    if (node.type === 'subflow:'+subflowId) {
-                        if (!changed[node.id]) {
-                            changed[node.id] = node;
-                            if (!changed[changed[node.id].z] && newConfig.allNodes[changed[node.id].z]) {
-                                changed[changed[node.id].z] = newConfig.allNodes[changed[node.id].z];
-                                if (newConfig.allNodes[changed[node.id].z].type === "subflow") {
-                                    // This subflow instance is inside a subflow. Add the
-                                    // containing subflow to the stack to mark
-                                    changedSubflowStack.push(changed[node.id].z);
-                                    delete changed[node.id];
-                                }
+    // Recursively mark all instances of changed subflows as changed
+    var changedSubflowStack = Object.keys(changedSubflows);
+    while (changedSubflowStack.length > 0) {
+        var subflowId = changedSubflowStack.pop();
+        for (id in newConfig.allNodes) {
+            if (newConfig.allNodes.hasOwnProperty(id)) {
+                node = newConfig.allNodes[id];
+                if (node.type === 'subflow:'+subflowId) {
+                    if (!changed[node.id]) {
+                        changed[node.id] = node;
+                        if (!changed[changed[node.id].z] && newConfig.allNodes[changed[node.id].z]) {
+                            changed[changed[node.id].z] = newConfig.allNodes[changed[node.id].z];
+                            if (newConfig.allNodes[changed[node.id].z].type === "subflow") {
+                                // This subflow instance is inside a subflow. Add the
+                                // containing subflow to the stack to mark
+                                changedSubflowStack.push(changed[node.id].z);
+                                delete changed[node.id];
                             }
                         }
                     }
                 }
             }
         }
+    }
 
-        var diff = {
-            added:Object.keys(added),
-            changed:Object.keys(changed),
-            removed:Object.keys(removed),
-            rewired:Object.keys(wiringChanged),
-            linked:[]
-        }
 
-        // Traverse the links of all modified nodes to mark the connected nodes
-        var modifiedNodes = diff.added.concat(diff.changed).concat(diff.removed).concat(diff.rewired);
-        var visited = {};
-        while (modifiedNodes.length > 0) {
-            node = modifiedNodes.pop();
-            if (!visited[node]) {
-                visited[node] = true;
-                if (linkMap[node]) {
-                    if (!changed[node] && !added[node] && !removed[node] && !wiringChanged[node]) {
-                        diff.linked.push(node);
-                    }
-                    modifiedNodes = modifiedNodes.concat(linkMap[node]);
+
+    var diff = {
+        added:Object.keys(added),
+        changed:Object.keys(changed),
+        removed:Object.keys(removed),
+        rewired:Object.keys(wiringChanged),
+        linked:[],
+        flowChanged: Object.keys(flowChanged),
+        globalConfigChanged
+    }
+
+    // Traverse the links of all modified nodes to mark the connected nodes
+    var modifiedNodes = diff.added.concat(diff.changed).concat(diff.removed).concat(diff.rewired);
+    var visited = {};
+    while (modifiedNodes.length > 0) {
+        node = modifiedNodes.pop();
+        if (!visited[node]) {
+            visited[node] = true;
+            if (linkMap[node]) {
+                if (!changed[node] && !added[node] && !removed[node] && !wiringChanged[node]) {
+                    diff.linked.push(node);
                 }
+                modifiedNodes = modifiedNodes.concat(linkMap[node]);
             }
         }
-        // console.log(diff);
-        // for (id in newConfig.allNodes) {
-        //     console.log(
-        //         (added[id]?"a":(changed[id]?"c":" "))+(wiringChanged[id]?"w":" ")+(diff.linked.indexOf(id)!==-1?"l":" "),
-        //         newConfig.allNodes[id].type.padEnd(10),
-        //         id.padEnd(16),
-        //         (newConfig.allNodes[id].z||"").padEnd(16),
-        //         newConfig.allNodes[id].name||newConfig.allNodes[id].label||""
-        //     );
-        // }
-        // for (id in removed) {
-        //     console.log(
-        //         "- "+(diff.linked.indexOf(id)!==-1?"~":" "),
-        //         id,
-        //         oldConfig.allNodes[id].type,
-        //         oldConfig.allNodes[id].name||oldConfig.allNodes[id].label||""
-        //     );
-        // }
-
-        return diff;
-    },
-
-    /**
-     * Create a new instance of a node
-     * @param  {Flow} flow     The containing flow
-     * @param  {object} config The node configuration object
-     * @return {Node}          The instance of the node
-     */
-    createNode: createNode
+    }
+    // console.log(diff);
+    // for (id in newConfig.allNodes) {
+    //     if (added[id] || changed[id] || wiringChanged[id] || diff.linked.indexOf(id)!==-1) {
+    //         console.log(
+    //             (added[id]?"a":(changed[id]?"c":" "))+(wiringChanged[id]?"w":" ")+(diff.linked.indexOf(id)!==-1?"l":" "),
+    //             newConfig.allNodes[id].type.padEnd(10),
+    //             id.padEnd(16),
+    //             (newConfig.allNodes[id].z||"").padEnd(16),
+    //             newConfig.allNodes[id].name||newConfig.allNodes[id].label||""
+    //         );
+    //     }
+    // }
+    // for (id in removed) {
+    //     console.log(
+    //         "- "+(diff.linked.indexOf(id)!==-1?"~":" "),
+    //         id,
+    //         oldConfig.allNodes[id].type,
+    //         oldConfig.allNodes[id].name||oldConfig.allNodes[id].label||""
+    //     );
+    // }
+
+    return diff;
+}
+
+module.exports = {
+    init,
+    createNode,
+    parseConfig,
+    diffConfigs,
+    diffNodes,
+    getEnvVar,
+    mapEnvVarProperties,
+    evaluateEnvProperties
 }