Skip to content

Commit 6759dc9

Browse files
committed
(chore)Export ApplyParams
1 parent c3976f9 commit 6759dc9

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

array_str.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func AddOpMerge(jl *JSONLogic) {
225225
}
226226

227227
func opMerge(apply Applier, params []interface{}, data interface{}) (res interface{}, err error) {
228-
params, err = applyParams(apply, params, data)
228+
params, err = ApplyParams(apply, params, data)
229229
if err != nil {
230230
return
231231
}
@@ -252,7 +252,7 @@ func opIn(apply Applier, params []interface{}, data interface{}) (res interface{
252252
if len(params) < 2 {
253253
return nil, fmt.Errorf("in: expect at least two params")
254254
}
255-
params, err = applyParams(apply, params, data)
255+
params, err = ApplyParams(apply, params, data)
256256
if err != nil {
257257
return
258258
}
@@ -292,7 +292,7 @@ func AddOpCat(jl *JSONLogic) {
292292
}
293293

294294
func opCat(apply Applier, params []interface{}, data interface{}) (res interface{}, err error) {
295-
params, err = applyParams(apply, params, data)
295+
params, err = ApplyParams(apply, params, data)
296296
if err != nil {
297297
return
298298
}
@@ -317,7 +317,7 @@ func opSubstr(apply Applier, params []interface{}, data interface{}) (res interf
317317
if len(params) < 2 {
318318
return nil, fmt.Errorf("substr: expect at least two params")
319319
}
320-
params, err = applyParams(apply, params, data)
320+
params, err = ApplyParams(apply, params, data)
321321
if err != nil {
322322
return
323323
}

data_access.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func opVar(apply Applier, params []interface{}, data interface{}) (res interface
1717
if len(params) < 1 {
1818
return nil, fmt.Errorf("var: expect at least one param")
1919
}
20-
params, err = applyParams(apply, params, data)
20+
params, err = ApplyParams(apply, params, data)
2121
if err != nil {
2222
return
2323
}
@@ -90,7 +90,7 @@ func opMissing(apply Applier, params []interface{}, data interface{}) (res inter
9090
if len(params) == 0 {
9191
return []interface{}{}, nil
9292
}
93-
params, err = applyParams(apply, params, data)
93+
params, err = ApplyParams(apply, params, data)
9494
if err != nil {
9595
return
9696
}
@@ -125,7 +125,7 @@ func opMissingSome(apply Applier, params []interface{}, data interface{}) (res i
125125
if len(params) != 2 {
126126
return nil, fmt.Errorf("missing_some: expect 2 params")
127127
}
128-
params, err = applyParams(apply, params, data)
128+
params, err = ApplyParams(apply, params, data)
129129
if err != nil {
130130
return
131131
}

helpers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ func compareValues(symbol compSymbol, left, right interface{}) (bool, error) {
217217

218218
}
219219

220-
func applyParams(apply Applier, params []interface{}, data interface{}) ([]interface{}, error) {
220+
// ApplyParams apply data to an array of params. Useful in operation implementation.
221+
func ApplyParams(apply Applier, params []interface{}, data interface{}) ([]interface{}, error) {
221222
r, err := apply(params, data)
222223
if err != nil {
223224
return nil, err

logic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func opStrictEqual(apply Applier, params []interface{}, data interface{}) (res i
4040
if len(params) < 2 {
4141
return nil, fmt.Errorf("===/!==: expect at least two params")
4242
}
43-
params, err = applyParams(apply, params, data)
43+
params, err = ApplyParams(apply, params, data)
4444
if err != nil {
4545
return
4646
}

numeric.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func opCompare(symbol compSymbol) Operation {
3535
if len(params) < 2 {
3636
return nil, fmt.Errorf("%s: expect at least two params", symbol)
3737
}
38-
params, err = applyParams(apply, params, data)
38+
params, err = ApplyParams(apply, params, data)
3939
if err != nil {
4040
return
4141
}
@@ -185,7 +185,7 @@ func opMinus(apply Applier, params []interface{}, data interface{}) (res interfa
185185
}
186186
return -n, nil
187187
default:
188-
params, err := applyParams(apply, params, data)
188+
params, err := ApplyParams(apply, params, data)
189189
if err != nil {
190190
return nil, err
191191
}
@@ -216,7 +216,7 @@ func opDiv(apply Applier, params []interface{}, data interface{}) (res interface
216216
if len(params) < 2 {
217217
return nil, fmt.Errorf("/: expect at least two params")
218218
}
219-
params, err = applyParams(apply, params, data)
219+
params, err = ApplyParams(apply, params, data)
220220
if err != nil {
221221
return
222222
}
@@ -246,7 +246,7 @@ func opMod(apply Applier, params []interface{}, data interface{}) (res interface
246246
if len(params) < 2 {
247247
return nil, fmt.Errorf("%%: expect at least two params")
248248
}
249-
params, err = applyParams(apply, params, data)
249+
params, err = ApplyParams(apply, params, data)
250250
if err != nil {
251251
return
252252
}

0 commit comments

Comments
 (0)