pass opts (flags) as pointer to more places and through recursion; st…

…art breaking out op funcs for differnt node types Signed-off-by: Tony Worm <tony@hofstadter.io>
hofstadter-io · Nov 19, 2021 · bd4c8b2 · bd4c8b2
1 parent 937a998
commit bd4c8b2
Show file tree

Hide file tree

Showing 30 changed files with 376 additions and 207 deletions.
diff --git a/.hof/shadow/Cli/cmd/cuetils/cmd/root.go b/.hof/shadow/Cli/cmd/cuetils/cmd/root.go
@@ -28,7 +28,7 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&(flags.RootPflags.Out), "out", "", "cue", "output encoding [cue,yaml,json]")
 	RootCmd.PersistentFlags().StringVarP(&(flags.RootPflags.Outname), "outname", "o", "", "output filename when being used")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.Overwrite), "overwrite", "F", false, "overwrite files being processed")
-	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.TypeErrors), "type-errors", "E", false, "error when nodes or leafs have type mismatches")
+	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.AllTypeErrors), "type-errors", "E", false, "error when nodes or leafs have type mismatches")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.NodeTypeErrors), "node-type-errors", "N", false, "error when nodes have type mismatches")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.LeafTypeErrors), "leaf-type-errors", "L", false, "error when leafs have type mismatches")
 }

diff --git a/.hof/shadow/Cli/cmd/cuetils/flags/root.go b/.hof/shadow/Cli/cmd/cuetils/flags/root.go
@@ -57,7 +57,7 @@ type RootPflagpole struct {
 	Out            string
 	Outname        string
 	Overwrite      bool
-	TypeErrors     bool
+	AllTypeErrors  bool
 	NodeTypeErrors bool
 	LeafTypeErrors bool
 }

diff --git a/cmd/cuetils/cmd/count.go b/cmd/cuetils/cmd/count.go
@@ -17,7 +17,7 @@ func CountRun(globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	counts, err := structural.CountGlobs(globs, flags.RootPflags)
+	counts, err := structural.CountGlobs(globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/cuetils/cmd/depth.go b/cmd/cuetils/cmd/depth.go
@@ -17,7 +17,7 @@ func DepthRun(globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	depths, err := structural.DepthGlobs(globs, flags.RootPflags)
+	depths, err := structural.DepthGlobs(globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/cuetils/cmd/diff.go b/cmd/cuetils/cmd/diff.go
@@ -17,12 +17,12 @@ func DiffRun(orig string, next string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.DiffGlobs(orig, next, flags.RootPflags)
+	results, err := structural.DiffGlobs(orig, next, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -108,4 +108,4 @@ func init() {
 	DiffCmd.SetHelpFunc(help)
 	DiffCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/insert.go b/cmd/cuetils/cmd/insert.go
@@ -17,12 +17,12 @@ func InsertRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.InsertGlobs(code, globs, flags.RootPflags)
+	results, err := structural.InsertGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }

diff --git a/cmd/cuetils/cmd/mask.go b/cmd/cuetils/cmd/mask.go
@@ -17,12 +17,12 @@ func MaskRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.MaskGlobs(code, globs, flags.RootPflags)
+	results, err := structural.MaskGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -102,4 +102,4 @@ func init() {
 	MaskCmd.SetHelpFunc(help)
 	MaskCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/patch.go b/cmd/cuetils/cmd/patch.go
@@ -17,12 +17,12 @@ func PatchRun(patch string, orig string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.PatchGlobs(patch, orig, flags.RootPflags)
+	results, err := structural.PatchGlobs(patch, orig, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -108,4 +108,4 @@ func init() {
 	PatchCmd.SetHelpFunc(help)
 	PatchCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/pick.go b/cmd/cuetils/cmd/pick.go
@@ -17,12 +17,12 @@ func PickRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.PickGlobs(code, globs, flags.RootPflags)
+	results, err := structural.PickGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -102,4 +102,4 @@ func init() {
 	PickCmd.SetHelpFunc(help)
 	PickCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/replace.go b/cmd/cuetils/cmd/replace.go
@@ -17,12 +17,12 @@ func ReplaceRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.ReplaceGlobs(code, globs, flags.RootPflags)
+	results, err := structural.ReplaceGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -102,4 +102,4 @@ func init() {
 	ReplaceCmd.SetHelpFunc(help)
 	ReplaceCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/root.go b/cmd/cuetils/cmd/root.go
@@ -28,7 +28,7 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&(flags.RootPflags.Out), "out", "", "cue", "output encoding [cue,yaml,json]")
 	RootCmd.PersistentFlags().StringVarP(&(flags.RootPflags.Outname), "outname", "o", "", "output filename when being used")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.Overwrite), "overwrite", "F", false, "overwrite files being processed")
-	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.TypeErrors), "type-errors", "E", false, "error when nodes or leafs have type mismatches")
+	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.AllTypeErrors), "type-errors", "E", false, "error when nodes or leafs have type mismatches")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.NodeTypeErrors), "node-type-errors", "N", false, "error when nodes have type mismatches")
 	RootCmd.PersistentFlags().BoolVarP(&(flags.RootPflags.LeafTypeErrors), "leaf-type-errors", "L", false, "error when leafs have type mismatches")
 }

diff --git a/cmd/cuetils/cmd/transform.go b/cmd/cuetils/cmd/transform.go
@@ -17,12 +17,12 @@ func TransformRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.TransformGlobs(code, globs, flags.RootPflags)
+	results, err := structural.TransformGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -102,4 +102,4 @@ func init() {
 	TransformCmd.SetHelpFunc(help)
 	TransformCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/upsert.go b/cmd/cuetils/cmd/upsert.go
@@ -17,12 +17,12 @@ func UpsertRun(code string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.UpsertGlobs(code, globs, flags.RootPflags)
+	results, err := structural.UpsertGlobs(code, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
 
-	err = structural.ProcessOutputs(results, flags.RootPflags)
+	err = structural.ProcessOutputs(results, &flags.RootPflags)
 
 	return err
 }
@@ -102,4 +102,4 @@ func init() {
 	UpsertCmd.SetHelpFunc(help)
 	UpsertCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/cmd/validate.go b/cmd/cuetils/cmd/validate.go
@@ -17,7 +17,7 @@ func ValidateRun(schema string, globs []string) (err error) {
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	results, err := structural.ValidateGlobs(schema, globs, flags.RootPflags)
+	results, err := structural.ValidateGlobs(schema, globs, &flags.RootPflags)
 	if err != nil {
 		return err
 	}
@@ -108,4 +108,4 @@ func init() {
 	ValidateCmd.SetHelpFunc(help)
 	ValidateCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/cuetils/flags/root.go b/cmd/cuetils/flags/root.go
@@ -57,7 +57,7 @@ type RootPflagpole struct {
 	Out            string
 	Outname        string
 	Overwrite      bool
-	TypeErrors     bool
+	AllTypeErrors  bool
 	NodeTypeErrors bool
 	LeafTypeErrors bool
 }

diff --git a/gen.cue b/gen.cue
@@ -112,7 +112,7 @@ Cli: gen.#HofGenerator & {
 		Default: "false"
 		Help:    "overwrite files being processed"
 	},{
-		Name:    "typeErrors"
+		Name:    "allTypeErrors"
 		Long:    "type-errors"
 		Short:   "E"
 		Type:    "bool"

diff --git a/structural/common.go b/structural/common.go
@@ -54,9 +54,9 @@ func GetLabel(val cue.Value) cue.Selector {
 	return s
 }
 
-type BinaryOpValueFunc func(lhs, rhs cue.Value) (cue.Value, error)
+type BinaryOpValueFunc func(lhs, rhs cue.Value, opts *flags.RootPflagpole) (cue.Value, error)
 
-func BinaryOpGlobs(lhs string, rhs []string, rflags flags.RootPflagpole, fn BinaryOpValueFunc) ([]GlobResult, error) {
+func BinaryOpGlobs(lhs string, rhs []string, opts *flags.RootPflagpole, fn BinaryOpValueFunc) ([]GlobResult, error) {
 	ctx := cuecontext.New()
 
 	lv, err := ReadArg(lhs, ctx, nil)
@@ -78,7 +78,7 @@ func BinaryOpGlobs(lhs string, rhs []string, rflags flags.RootPflagpole, fn Bina
 		}
 
 		// Call our OpValueFunc
-		v, err := fn(lv.Value, iv)
+		v, err := fn(lv.Value, iv, opts)
 		if err != nil {
 			return nil, err
 		}
@@ -92,9 +92,9 @@ func BinaryOpGlobs(lhs string, rhs []string, rflags flags.RootPflagpole, fn Bina
 	return results, nil
 }
 
-type UnaryOpValueFunc func(val cue.Value) (cue.Value, error)
+type UnaryOpValueFunc func(val cue.Value, opts *flags.RootPflagpole) (cue.Value, error)
 
-func UnaryOpGlobs(globs []string, rflags flags.RootPflagpole, fn UnaryOpValueFunc) ([]GlobResult, error) {
+func UnaryOpGlobs(globs []string, opts *flags.RootPflagpole, fn UnaryOpValueFunc) ([]GlobResult, error) {
 	ctx := cuecontext.New()
 
 	vals, err := LoadGlobs(globs)
@@ -114,7 +114,7 @@ func UnaryOpGlobs(globs []string, rflags flags.RootPflagpole, fn UnaryOpValueFun
 		}
 
 		// Call our OpValueFunc
-		v, err := fn(iv)
+		v, err := fn(iv, opts)
 		if err != nil {
 			return nil, err
 		}

diff --git a/structural/count.go b/structural/count.go
@@ -20,7 +20,7 @@ type CountResult struct {
 	Count    int
 }
 
-func CountGlobs(globs []string, rflags flags.RootPflagpole) ([]CountResult, error) {
+func CountGlobs(globs []string, opts *flags.RootPflagpole) ([]CountResult, error) {
 	// no globs, then stdin
 	if len(globs) == 0 {
 		globs = []string{"-"}

diff --git a/structural/depth.go b/structural/depth.go
@@ -14,7 +14,7 @@ type DepthResult struct {
 	Depth    int
 }
 
-func DepthGlobs(globs []string, rflags flags.RootPflagpole) ([]DepthResult, error) {
+func DepthGlobs(globs []string, opts *flags.RootPflagpole) ([]DepthResult, error) {
 	// no globs, then stdin
 	if len(globs) == 0 {
 		globs = []string{"-"}

diff --git a/structural/diff.go b/structural/diff.go
@@ -15,24 +15,24 @@ val: #Y: _
 diff: val.diff
 `
 
-func DiffGlobs(orig string, next string, rflags flags.RootPflagpole) ([]GlobResult, error) {
-	return DiffGlobsCue(orig, next, rflags)
+func DiffGlobs(orig string, next string, opts *flags.RootPflagpole) ([]GlobResult, error) {
+	return DiffGlobsCue(orig, next, opts)
 }
 
-func DiffGlobsGo(orig string, next string, rflags flags.RootPflagpole) ([]GlobResult, error) {
-	return BinaryOpGlobs(orig, []string{next}, rflags, DiffValues)
+func DiffGlobsGo(orig string, next string, opts *flags.RootPflagpole) ([]GlobResult, error) {
+	return BinaryOpGlobs(orig, []string{next}, opts, DiffValues)
 }
 
-func DiffValues(orig, next cue.Value) (cue.Value, error) {
-	r, _ := diffValues(orig, next)
+func DiffValues(orig, next cue.Value, opts *flags.RootPflagpole) (cue.Value, error) {
+	r, _ := diffValues(orig, next, opts)
 	return r, nil
 }
 
-func diffValues(orig, next cue.Value) (cue.Value, bool) {
+func diffValues(orig, next cue.Value, opts *flags.RootPflagpole) (cue.Value, bool) {
 	return orig, false
 }
 
-func DiffGlobsCue(orig string, next string, rflags flags.RootPflagpole) ([]GlobResult, error) {
+func DiffGlobsCue(orig string, next string, opts *flags.RootPflagpole) ([]GlobResult, error) {
 	cuest, err := NewCuest([]string{"diff"}, nil)
 	if err != nil {
 		return nil, err
@@ -50,7 +50,7 @@ func DiffGlobsCue(orig string, next string, rflags flags.RootPflagpole) ([]GlobR
 
 	// construct reusable val with function
 	maxiter := ""
-	if mi := rflags.Maxiter; mi > 0 {
+	if mi := opts.Maxiter; mi > 0 {
 		maxiter = fmt.Sprintf(" & { #maxiter: %d }", mi)
 	}
 	content := fmt.Sprintf(difffmt, maxiter)

diff --git a/structural/error.go b/structural/error.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/errors"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
@@ -42,3 +43,18 @@ func FormatCueError(err error) string {
 	s := w.String()
 	return s
 }
+
+func getErrorAttrMsg(val cue.Value) (string, bool) {
+	msg, has := "", false
+	attr := val.Attribute("error")
+	if attr.Err() == nil {
+		has = true
+		if attr.NumArgs() > 0 {
+			m, _ := attr.String(0)
+			if m != "" {
+				msg = m
+			}
+		}
+	}
+	return msg, has
+}