cue/tools/flow: allow tasks in hidden fields

This updates the flow Config object to allow Tasks in hidden fields.

Change-Id: I8809d83e7543e33cdec4950014efdac39a88be71
Signed-off-by: Joel Longtine <joel@longtine.io>
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/532797
Unity-Result: CUEcueckoo <cueckoo@cuelang.org>
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
Reviewed-by: Marcel van Lohuizen <mpvl@gmail.com>

Author: jlongtine

tools/flow/flow.go

@@ -135,6 +135,9 @@ type Config struct {
 	// concrete and cannot change.
 	IgnoreConcrete bool
 
+	// FindHiddenTasks allows tasks to be defined in hidden fields.
+	FindHiddenTasks bool
+
 	// UpdateFunc is called whenever the information in the controller is
 	// updated. This includes directly after initialization. The task may be
 	// nil if this call is not the result of a task completing.

tools/flow/flow_test.go

@@ -72,10 +72,11 @@ func TestFlow(t *testing.T) {
 		}
 
 		cfg := &flow.Config{
-			Root:           cue.ParsePath("root"),
-			InferTasks:     t.Bool("InferTasks"),
-			IgnoreConcrete: t.Bool("IgnoreConcrete"),
-			UpdateFunc:     updateFunc,
+			Root:            cue.ParsePath("root"),
+			InferTasks:      t.Bool("InferTasks"),
+			IgnoreConcrete:  t.Bool("IgnoreConcrete"),
+			FindHiddenTasks: t.Bool("FindHiddenTasks"),
+			UpdateFunc:      updateFunc,
 		}
 
 		c := flow.New(cfg, v, taskFunc)

tools/flow/tasks.go

@@ -68,7 +68,13 @@ func (c *Controller) findRootTasks(v cue.Value) {
 		return
 	}
 
-	for iter, _ := v.Fields(); iter.Next(); {
+	opts := []cue.Option{}
+
+	if c.cfg.FindHiddenTasks {
+		opts = append(opts, cue.Hidden(true), cue.Definitions(false))
+	}
+
+	for iter, _ := v.Fields(opts...); iter.Next(); {
 		c.findRootTasks(iter.Value())
 	}
 }

tools/flow/testdata/hidden.txtar

@@ -0,0 +1,87 @@
+#FindHiddenTasks: true
+-- in.cue --
+root: {
+    a: {
+        $id: "valToOut"
+        val: "foo"
+        out: string
+    }
+    _b: {
+        $id: "valToOut"
+        $after: a
+        val: "bar"
+        out: string
+    }
+    c: {
+        $id: "valToOut"
+        out: a.out + _b.out
+    }
+    // These tasks should _not_ run, because they are definitions.
+    _#c: {
+        $id: "valToOut"
+        out: c.out + "baz"
+    }
+    #d: {
+        $id: "valToOut"
+        out: c.out + "baz"
+    }
+}
+-- out/run/errors --
+-- out/run/t0 --
+graph TD
+  t0("root.a [Ready]")
+  t1("root._b [Waiting]")
+  t1-->t0
+  t2("root.c [Waiting]")
+  t2-->t0
+  t2-->t1
+
+-- out/run/t1 --
+graph TD
+  t0("root.a [Terminated]")
+  t1("root._b [Ready]")
+  t1-->t0
+  t2("root.c [Waiting]")
+  t2-->t0
+  t2-->t1
+
+-- out/run/t1/value --
+{
+	$id: "valToOut"
+	val: "foo"
+	out: "foo"
+}
+-- out/run/t2 --
+graph TD
+  t0("root.a [Terminated]")
+  t1("root._b [Terminated]")
+  t1-->t0
+  t2("root.c [Ready]")
+  t2-->t0
+  t2-->t1
+
+-- out/run/t2/value --
+{
+	$id: "valToOut"
+	$after: {
+		$id: "valToOut"
+		val: "foo"
+		out: "foo"
+	}
+	val: "bar"
+	out: "bar"
+}
+-- out/run/t3 --
+graph TD
+  t0("root.a [Terminated]")
+  t1("root._b [Terminated]")
+  t1-->t0
+  t2("root.c [Terminated]")
+  t2-->t0
+  t2-->t1
+
+-- out/run/t3/value --
+{
+	$id: "valToOut"
+	out: "foobar"
+}