Merge pull request #19 from GettEngineering/issue-18

Generate default error for a desicion block

strategies/generators.go

@@ -3,6 +3,7 @@ package strategies
 import (
 	"fmt"
 	"go/ast"
+	goTypes "go/types"
 
 	"github.com/GettEngineering/effe/fields"
 	"github.com/GettEngineering/effe/types"
@@ -124,6 +125,19 @@ func GenDecisionComponentCall(f FlowGen, dComponent types.Component) (ComponentC
 		ctx.CalculateOutput([]ComponentCall{call})
 	}
 
+	var switchReturnErr bool
+
+	for _, output := range ctx.OutputList() {
+		if goTypes.ExprString(output.Type) == errorExpr {
+			switchReturnErr = true
+			break
+		}
+	}
+
+	if !switchReturnErr {
+		ctx.addOutput(ast.NewIdent("error"))
+	}
+
 	ctx.Output.List = sortComponentOutput(ctx.Output.List)
 
 	sharedVars := make(map[string]*ast.Ident)

testdata/DecisionGenerateDefaultError/foo/effe.go

@@ -0,0 +1,16 @@
+// +build effeinject
+
+package main
+
+import "github.com/GettEngineering/effe"
+
+func A() error {
+	effe.BuildFlow(
+		effe.Step(step1),
+		effe.Decision(new(a), effe.Failure(failure),
+			effe.Case("a", effe.Step(step2)),
+			effe.Case("", effe.Step(step3)),
+		),
+	)
+	return nil
+}

testdata/DecisionGenerateDefaultError/foo/steps.go

@@ -0,0 +1,30 @@
+package main
+
+import "fmt"
+
+type a string
+
+func failure() func(error) error {
+	return func(err error) error {
+		return err
+	}
+}
+
+func step2() func(a) int {
+	return func(v a) int {
+		fmt.Println(v)
+		return 0
+	}
+}
+
+func step3() func() int {
+	return func() int {
+		return 0
+	}
+}
+
+func step1() func() (a, error) {
+	return func() (a, error) {
+		return "a", nil
+	}
+}

testdata/DecisionGenerateDefaultError/pkg

@@ -0,0 +1 @@
+example.com/foo