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.

Sign up for GitHub

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

Jump to bottom

Filter list with custom function #417

Merged
merged 2 commits into from
Apr 25, 2022
Merged

Filter list with custom function #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
675a6b5
test(engine): verify list filter with function
saig0 Apr 25, 2022
b3e76be
fix(engine): filter list with function
saig0 Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/main/scala/org/camunda/feel/impl/interpreter/FeelInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,21 +253,23 @@ class FeelInterpreter {
case Filter(list, filter) =>
withList(
eval(list),
l =>
l => {
val evalFilterWithItem =
(item: Val) => eval(filter)(filterContext(item))

filter match {
case ConstNumber(index) => filterList(l.items, index)
case ArithmeticNegation(ConstNumber(index)) =>
filterList(l.items, -index)
case comparison: Comparison =>
filterList(l.items,
item => eval(comparison)(filterContext(item)))
case _: Comparison | _: FunctionInvocation |
_: QualifiedFunctionInvocation =>
filterList(l.items, evalFilterWithItem)
case _ =>
eval(filter) match {
case ValNumber(index) => filterList(l.items, index)
case _ =>
filterList(l.items,
item => eval(filter)(filterContext(item)))
case _ => filterList(l.items, evalFilterWithItem)
}
}
}
)
case IterationContext(start, end) =>
Expand Down
37 changes: 36 additions & 1 deletion src/test/scala/org/camunda/feel/impl/interpreter/InterpreterListExpressionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import org.camunda.feel.syntaxtree._
import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec

import scala.collection.mutable.ListBuffer

/**
* @author Philipp Ossler
*/
Expand Down Expand Up @@ -97,7 +99,7 @@ class InterpreterListExpressionTest
)))
}

it should "be filtered via boolean expression" in {
it should "be filtered via comparison" in {

eval("[1,2,3,4][item > 2]") should be(
ValList(List(ValNumber(3), ValNumber(4))))
Expand All @@ -121,6 +123,39 @@ class InterpreterListExpressionTest
eval("[1,2,3,4][i]", Map("i" -> -2)) should be(ValNumber(3))
}

it should "be filtered via boolean expression" in {
eval("[1,2,3,4][odd(item)]") should be(
ValList(List(ValNumber(1), ValNumber(3))))

eval("[1,2,3,4][even(item)]") should be(
ValList(List(ValNumber(2), ValNumber(4))))
}

it should "be filtered via custom function" in {
val functionInvocations: ListBuffer[Val] = ListBuffer.empty

val result = eval(
expression = "[1,2,3,4][f(item)]",
variables = Map(),
functions = Map("f" -> ValFunction(
params = List("x"),
invoke = {
case List(x) =>
functionInvocations += x
ValBoolean(x == ValNumber(3))
}
)))

result should be(ValList(List(ValNumber(3))))

functionInvocations should be(List(
ValNumber(1),
ValNumber(2),
ValNumber(3),
ValNumber(4))
)
}

it should "be filtered multiple times (from literal)" in {
eval("[[1]][1][1]") should be(ValNumber(1))
eval("[[[1]]][1][1][1]") should be(ValNumber(1))
Expand Down