Ensure flow walk order visits nodes last

This ensures any containing groups have been visited and are known before
the individual nodes are visited

Author: knolleary

README.md

@@ -26,14 +26,14 @@ The `walk` function can be used to invoke a function on every object in the flow
 configuration in a reasonably well-defined order:
 
  - Subflow definitions
-   - Nodes
    - Config nodes scoped to this subflow
    - Groups
+   - Nodes
  - Global Config nodes
  - Flows
-   - Nodes
    - Config nodes scoped to this flow
    - Groups
+   - Nodes
 
 ```
 const fs = require("fs");

lib/NRContainer.js

@@ -33,9 +33,8 @@ class NRContainer extends NRObject {
         return result;
     }
 
-    walk(callback) {
-        super.walk(callback);
-        this.nodes.forEach(n => n.walk(callback))
+    walkContents(callback) {
+        this.nodes.forEach(n => n.walk(callback));
     }
 }
 

lib/NRFlow.js

@@ -84,6 +84,7 @@ class NRFlow extends NRContainer {
         this.subflows.forEach(n => n.walk(callback))
         this.configs.forEach(n => n.walk(callback))
         this.groups.forEach(n => n.walk(callback))
+        super.walkContents(callback);
     }
 }
 module.exports = NRFlow;

lib/NRGroup.js

@@ -59,11 +59,6 @@ class NRGroup extends NRContainer {
         // export this contents this way.
         return [];
     }
-
-    walk(callback) {
-        // Don't use super.walk as that will revisit this.nodes
-        callback(this);
-    }
 }
 
 module.exports = NRGroup

lib/NRObject.js

@@ -65,6 +65,10 @@ class NRObject {
             callback(this);
         }
     }
+    
+    walkContents(callback) {
+
+    }
 }
 
 module.exports = NRObject;

test/test.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const assert = require("assert");
-const fp = require("../lib/index.js");
+const FlowParser = require("../lib/index.js");
 
 describe("Flow Parser tests", function() {
     it('passes flow 1', function() {
@@ -12,20 +12,33 @@ describe("Flow Parser tests", function() {
 
     function runTests(filename) {
         const original = JSON.parse(fs.readFileSync(filename,"utf-8"));
-        const flowSet = fp.parseFlow(original);
+        const flowSet = FlowParser.parseFlow(original);
         const generated = flowSet.export();
 
+
+
         // flowSet.walk(function(obj) {
-        //     if (obj.type === 'tab') {
-        //         console.log("FLOW",obj.type)
-        //     } else if (obj.type === 'subflow') {
-        //         console.log("SUBFLOW",obj.type)
-        //     } else if (obj.type === 'group') {
-        //         console.log("GROUP",obj.type)
-        //     } else if (obj.constructor.name === 'NRConfigNode') {
-        //         console.log("CONFIG NODE",obj.type)
-        //     } else {
-        //         console.log("NODE",obj.type)
+        //     switch(obj.TYPE) {
+        //         case FlowParser.types.Flow:
+        //             // A flow object
+        //             console.log("FLOW",obj.id)
+        //             break;
+        //         case FlowParser.types.Subflow:
+        //             // A subflow definition
+        //             console.log("SUBFLOW",obj.id)
+        //             break;
+        //         case FlowParser.types.Group:
+        //             // A group object
+        //             console.log(" Group",obj.id)
+        //             break;
+        //         case FlowParser.types.ConfigNode:
+        //             // A config node
+        //             console.log(" ConfigNode",obj.id)
+        //             break;
+        //         case FlowParser.types.Node:
+        //             // A flow node
+        //             console.log(" Node",obj.id)
+        //             break;
         //     }
         // })