Add and or funcs

Author: TomWright

func.go

@@ -56,6 +56,8 @@ func standardFunctions() *FunctionCollection {
 		EqualFunc,
 		MoreThanFunc,
 		LessThanFunc,
+		AndFunc,
+		OrFunc,
 
 		// Metadata
 		MetadataFunc,

func_and.go

@@ -0,0 +1,53 @@
+package dasel
+
+import (
+	"fmt"
+	"reflect"
+)
+
+var AndFunc = BasicFunction{
+	name: "and",
+	runFn: func(c *Context, s *Step, args []string) (Values, error) {
+		if err := requireXOrMoreArgs("filter", args, 1); err != nil {
+			return nil, err
+		}
+
+		input := c.inputValue(s)
+
+		runComparison := func(value Value, selector string) (bool, error) {
+			gotValues, err := performSubQuery(c, value, selector)
+			if err != nil {
+				return false, err
+			}
+
+			if len(gotValues) > 1 {
+				return false, fmt.Errorf("and expects selector to return a single value")
+			}
+
+			if len(gotValues) == 0 {
+				return false, nil
+			}
+
+			return IsTruthy(gotValues[0]), nil
+		}
+
+		res := make(Values, 0)
+
+		for _, val := range input {
+			valPassed := true
+			for _, cmp := range args {
+				pass, err := runComparison(val, cmp)
+				if err != nil {
+					return nil, err
+				}
+				if !pass {
+					valPassed = false
+					break
+				}
+			}
+			res = append(res, Value{Value: reflect.ValueOf(valPassed)})
+		}
+
+		return res, nil
+	},
+}

func_and_test.go

@@ -0,0 +1,32 @@
+package dasel
+
+import (
+	"testing"
+)
+
+func TestAndFunc(t *testing.T) {
+	t.Run(
+		"NoneEqualMoreThan",
+		selectTest(
+			"numbers.all().and(equal(.,2),moreThan(.,2))",
+			map[string]interface{}{
+				"numbers": []interface{}{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+			},
+			[]interface{}{
+				false, false, false, false, false, false, false, false, false, false,
+			},
+		),
+	)
+	t.Run(
+		"SomeEqualMoreThan",
+		selectTest(
+			"numbers.all().and(equal(.,4),moreThan(.,2))",
+			map[string]interface{}{
+				"numbers": []interface{}{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+			},
+			[]interface{}{
+				false, false, false, false, true, false, false, false, false, false,
+			},
+		),
+	)
+}

func_filter_test.go

@@ -91,4 +91,98 @@ func TestFilterFunc(t *testing.T) {
 			},
 		),
 	)
+
+	t.Run(
+		"Filter And",
+		selectTest(
+			"all().filter(and(equal(primary,true),equal(name,red))).name",
+			[]interface{}{
+				map[string]interface{}{
+					"name":    "red",
+					"hex":     "ff0000",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "green",
+					"hex":     "00ff00",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "blue",
+					"hex":     "0000ff",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "orange",
+					"hex":     "ffa500",
+					"primary": false,
+				},
+			},
+			[]interface{}{
+				"red",
+			},
+		),
+	)
+
+	t.Run(
+		"Filter And",
+		selectTest(
+			"all().filter(and(equal(primary,true),equal(name,orange))).name",
+			[]interface{}{
+				map[string]interface{}{
+					"name":    "red",
+					"hex":     "ff0000",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "green",
+					"hex":     "00ff00",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "blue",
+					"hex":     "0000ff",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "orange",
+					"hex":     "ffa500",
+					"primary": false,
+				},
+			},
+			[]interface{}{},
+		),
+	)
+
+	t.Run(
+		"Filter Or",
+		selectTest(
+			"all().filter(or(equal(primary,true),equal(name,orange))).name",
+			[]interface{}{
+				map[string]interface{}{
+					"name":    "red",
+					"hex":     "ff0000",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "green",
+					"hex":     "00ff00",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "blue",
+					"hex":     "0000ff",
+					"primary": true,
+				},
+				map[string]interface{}{
+					"name":    "orange",
+					"hex":     "ffa500",
+					"primary": false,
+				},
+			},
+			[]interface{}{
+				"red", "green", "blue", "orange",
+			},
+		),
+	)
 }

func_or.go

@@ -0,0 +1,53 @@
+package dasel
+
+import (
+	"fmt"
+	"reflect"
+)
+
+var OrFunc = BasicFunction{
+	name: "or",
+	runFn: func(c *Context, s *Step, args []string) (Values, error) {
+		if err := requireXOrMoreArgs("or", args, 1); err != nil {
+			return nil, err
+		}
+
+		input := c.inputValue(s)
+
+		runComparison := func(value Value, selector string) (bool, error) {
+			gotValues, err := performSubQuery(c, value, selector)
+			if err != nil {
+				return false, err
+			}
+
+			if len(gotValues) > 1 {
+				return false, fmt.Errorf("or expects selector to return a single value")
+			}
+
+			if len(gotValues) == 0 {
+				return false, nil
+			}
+
+			return IsTruthy(gotValues[0]), nil
+		}
+
+		res := make(Values, 0)
+
+		for _, val := range input {
+			valPassed := false
+			for _, cmp := range args {
+				pass, err := runComparison(val, cmp)
+				if err != nil {
+					return nil, err
+				}
+				if pass {
+					valPassed = true
+					break
+				}
+			}
+			res = append(res, Value{Value: reflect.ValueOf(valPassed)})
+		}
+
+		return res, nil
+	},
+}

func_or_test.go

@@ -0,0 +1,32 @@
+package dasel
+
+import (
+	"testing"
+)
+
+func TestOrFunc(t *testing.T) {
+	t.Run(
+		"NoneEqualMoreThan",
+		selectTest(
+			"numbers.all().or(equal(.,2),moreThan(.,2))",
+			map[string]interface{}{
+				"numbers": []interface{}{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+			},
+			[]interface{}{
+				false, false, true, true, true, true, true, true, true, true,
+			},
+		),
+	)
+	t.Run(
+		"SomeEqualMoreThan",
+		selectTest(
+			"numbers.all().or(equal(.,0),moreThan(.,2))",
+			map[string]interface{}{
+				"numbers": []interface{}{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+			},
+			[]interface{}{
+				true, false, false, true, true, true, true, true, true, true,
+			},
+		),
+	)
+}