Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Implementing std.groupBy #726

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -1992,6 +1992,47 @@ func builtinExtVar(i *interpreter, name value) (value, error) {
return nil, i.Error("Undefined external variable: " + string(index))
}

func builtinGroupBy(i *interpreter, arguments []value) (value, error) {
arrv := arguments[0]
keyFv := arguments[1]

arr, err := i.getArray(arrv)
if err != nil {
return nil, err
}
keyF, err := i.getFunction(keyFv)
if err != nil {
return nil, err
}
json := make(map[string]interface{})
for _, thunk := range arr.elements {
currentValue, err := keyF.call(i, args(thunk))
if err != nil {
return nil, err
}
toStrVal, err := builtinToString(i, currentValue)
if err != nil {
return nil, err
}
strVal, err := i.getString(toStrVal)
if err != nil {
return nil, err
}
thunkValue, err := thunk.getValue(i)
if err != nil {
return nil, err
}

if json[strVal.getGoString()] == nil {
json[strVal.getGoString()] = []interface{}{thunkValue}
} else {
temp := json[strVal.getGoString()].([]interface{})
json[strVal.getGoString()] = append(temp, thunkValue)
}
}
return jsonToValue(i, json)
}

func builtinMinArray(i *interpreter, arguments []value) (value, error) {
arrv := arguments[0]
keyFv := arguments[1]
Expand Down Expand Up @@ -2530,6 +2571,7 @@ var funcBuiltins = buildBuiltinMap([]builtin{
&generalBuiltin{name: "sort", function: builtinSort, params: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
&generalBuiltin{name: "minArray", function: builtinMinArray, params: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
&generalBuiltin{name: "maxArray", function: builtinMaxArray, params: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
&generalBuiltin{name: "groupBy", function: builtinGroupBy, params: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
&unaryBuiltin{name: "native", function: builtinNative, params: ast.Identifiers{"x"}},
&unaryBuiltin{name: "sum", function: builtinSum, params: ast.Identifiers{"arr"}},
&unaryBuiltin{name: "avg", function: builtinAvg, params: ast.Identifiers{"arr"}},
Expand Down
3 changes: 3 additions & 0 deletions interpreter.go
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,9 @@ func jsonToValue(i *interpreter, v interface{}) (value, error) {
case string:
return makeValueString(v), nil

case value:
return v, nil

default:
return nil, i.Error(fmt.Sprintf("Not a json type: %#+v", v))
}
Expand Down
1 change: 1 addition & 0 deletions linter/internal/types/stdlib.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ func prepareStdlib(g *typeGraph) {
"sum": g.newSimpleFuncType(numberType, "arr"),
"minArray": g.newFuncType(anyArrayType, []ast.Parameter{required("arr"), optional("keyF")}),
"maxArray": g.newFuncType(anyArrayType, []ast.Parameter{required("arr"), optional("keyF")}),
"groupBy": g.newFuncType(anyArrayType, []ast.Parameter{required("arr"), optional("keyF")}),
"contains": g.newSimpleFuncType(boolType, "arr", "elem"),
"avg": g.newSimpleFuncType(numberType, "arr"),
"all": g.newSimpleFuncType(boolArrayType, "arr"),
Expand Down
12 changes: 12 additions & 0 deletions testdata/builtinGroupBy.golden
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"1": [
1,
1.5
],
"2": [
2
],
"3": [
3
]
}
1 change: 1 addition & 0 deletions testdata/builtinGroupBy.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
std.groupBy([1, 1.5, 2, 3], std.floor)
Empty file.
Loading