(chore)Export ApplyParams

huangjunwen · Sep 22, 2020 · 6759dc9 · 6759dc9
1 parent c3976f9
commit 6759dc9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/array_str.go b/array_str.go
@@ -225,7 +225,7 @@ func AddOpMerge(jl *JSONLogic) {
 }
 
 func opMerge(apply Applier, params []interface{}, data interface{}) (res interface{}, err error) {
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -252,7 +252,7 @@ func opIn(apply Applier, params []interface{}, data interface{}) (res interface{
 	if len(params) < 2 {
 		return nil, fmt.Errorf("in: expect at least two params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -292,7 +292,7 @@ func AddOpCat(jl *JSONLogic) {
 }
 
 func opCat(apply Applier, params []interface{}, data interface{}) (res interface{}, err error) {
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -317,7 +317,7 @@ func opSubstr(apply Applier, params []interface{}, data interface{}) (res interf
 	if len(params) < 2 {
 		return nil, fmt.Errorf("substr: expect at least two params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}

diff --git a/data_access.go b/data_access.go
@@ -17,7 +17,7 @@ func opVar(apply Applier, params []interface{}, data interface{}) (res interface
 	if len(params) < 1 {
 		return nil, fmt.Errorf("var: expect at least one param")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -90,7 +90,7 @@ func opMissing(apply Applier, params []interface{}, data interface{}) (res inter
 	if len(params) == 0 {
 		return []interface{}{}, nil
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -125,7 +125,7 @@ func opMissingSome(apply Applier, params []interface{}, data interface{}) (res i
 	if len(params) != 2 {
 		return nil, fmt.Errorf("missing_some: expect 2 params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}

diff --git a/helpers.go b/helpers.go
@@ -217,7 +217,8 @@ func compareValues(symbol compSymbol, left, right interface{}) (bool, error) {
 
 }
 
-func applyParams(apply Applier, params []interface{}, data interface{}) ([]interface{}, error) {
+// ApplyParams apply data to an array of params. Useful in operation implementation.
+func ApplyParams(apply Applier, params []interface{}, data interface{}) ([]interface{}, error) {
 	r, err := apply(params, data)
 	if err != nil {
 		return nil, err

diff --git a/logic.go b/logic.go
@@ -40,7 +40,7 @@ func opStrictEqual(apply Applier, params []interface{}, data interface{}) (res i
 	if len(params) < 2 {
 		return nil, fmt.Errorf("===/!==: expect at least two params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}

diff --git a/numeric.go b/numeric.go
@@ -35,7 +35,7 @@ func opCompare(symbol compSymbol) Operation {
 		if len(params) < 2 {
 			return nil, fmt.Errorf("%s: expect at least two params", symbol)
 		}
-		params, err = applyParams(apply, params, data)
+		params, err = ApplyParams(apply, params, data)
 		if err != nil {
 			return
 		}
@@ -185,7 +185,7 @@ func opMinus(apply Applier, params []interface{}, data interface{}) (res interfa
 		}
 		return -n, nil
 	default:
-		params, err := applyParams(apply, params, data)
+		params, err := ApplyParams(apply, params, data)
 		if err != nil {
 			return nil, err
 		}
@@ -216,7 +216,7 @@ func opDiv(apply Applier, params []interface{}, data interface{}) (res interface
 	if len(params) < 2 {
 		return nil, fmt.Errorf("/: expect at least two params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}
@@ -246,7 +246,7 @@ func opMod(apply Applier, params []interface{}, data interface{}) (res interface
 	if len(params) < 2 {
 		return nil, fmt.Errorf("%%: expect at least two params")
 	}
-	params, err = applyParams(apply, params, data)
+	params, err = ApplyParams(apply, params, data)
 	if err != nil {
 		return
 	}