Skip to content
Merged
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
37 changes: 37 additions & 0 deletions builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -1990,6 +1990,41 @@ func builtinContains(i *interpreter, arrv value, ev value) (value, error) {
return makeValueBoolean(false), nil
}

func builtinRemove(i *interpreter, arrv value, ev value) (value, error) {
arr, err := i.getArray(arrv)
if err != nil {
return nil, err
}
for idx, elem := range arr.elements {
val, err := elem.getValue(i)
if err != nil {
return nil, err
}
eq, err := rawEquals(i, val, ev)
if err != nil {
return nil, err
}
if eq {
return builtinRemoveAt(i, arrv, intToValue(idx))
}
}
return arr, nil
}

func builtinRemoveAt(i *interpreter, arrv value, idxv value) (value, error) {
arr, err := i.getArray(arrv)
if err != nil {
return nil, err
}
idx, err := i.getInt(idxv)
if err != nil {
return nil, err
}

newArr := append(arr.elements[:idx], arr.elements[idx+1:]...)
return makeValueArray(newArr), nil
}

func builtInObjectRemoveKey(i *interpreter, objv value, keyv value) (value, error) {
obj, err := i.getObject(objv)
if err != nil {
Expand Down Expand Up @@ -2286,6 +2321,8 @@ var funcBuiltins = buildBuiltinMap([]builtin{
&ternaryBuiltin{name: "foldl", function: builtinFoldl, params: ast.Identifiers{"func", "arr", "init"}},
&ternaryBuiltin{name: "foldr", function: builtinFoldr, params: ast.Identifiers{"func", "arr", "init"}},
&binaryBuiltin{name: "member", function: builtinMember, params: ast.Identifiers{"arr", "x"}},
&binaryBuiltin{name: "remove", function: builtinRemove, params: ast.Identifiers{"arr", "elem"}},
&binaryBuiltin{name: "removeAt", function: builtinRemoveAt, params: ast.Identifiers{"arr", "i"}},
&binaryBuiltin{name: "range", function: builtinRange, params: ast.Identifiers{"from", "to"}},
&binaryBuiltin{name: "primitiveEquals", function: primitiveEquals, params: ast.Identifiers{"x", "y"}},
&binaryBuiltin{name: "equals", function: builtinEquals, params: ast.Identifiers{"x", "y"}},
Expand Down
2 changes: 2 additions & 0 deletions linter/internal/types/stdlib.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func prepareStdlib(g *typeGraph) {
"sum": g.newSimpleFuncType(numberType, "arr"),
"minArray": g.newSimpleFuncType(anyType, "arr"),
"contains": g.newSimpleFuncType(boolType, "arr", "elem"),
"remove": g.newSimpleFuncType(anyArrayType, "arr", "elem"),
"removeAt": g.newSimpleFuncType(anyArrayType, "arr", "i"),

// Sets

Expand Down
4 changes: 4 additions & 0 deletions testdata/builtinRemove.golden
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
1,
3
]
1 change: 1 addition & 0 deletions testdata/builtinRemove.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
std.remove([1,2,3],2)
Empty file.
4 changes: 4 additions & 0 deletions testdata/builtinRemoveAt.golden
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
1,
3
]
1 change: 1 addition & 0 deletions testdata/builtinRemoveAt.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
std.removeAt([1,2,3],1)
Empty file.