patched criteria evaluator

viant · May 1, 2024 · 7f85749 · 7f85749
1 parent 1a401a3
commit 7f85749
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 16 deletions.
diff --git a/model/criteria/evaluator_test.go b/model/criteria/evaluator_test.go
@@ -22,6 +22,17 @@ func Test_EvaluateCriteria(t *testing.T) {
 		HasError      bool
 	}{
 
+		{
+			Description:   "selector $key1:1",
+			Expression:    "$checkAngular.Output:!/16.2.1/", //
+			DefaultResult: true,
+			Expected:      true,
+			State: map[string]interface{}{
+				"checkAngular.": map[string]interface{}{
+					"Output": "3",
+				},
+			},
+		},
 		{
 			Description:   "eq $key1:1",
 			Expression:    "$key1:1", //
@@ -161,7 +172,7 @@ func Test_EvaluateCriteria(t *testing.T) {
 		},
 	}
 
-	for i, useCase := range useCases[len(useCases)-1:] {
+	for i, useCase := range useCases[:1] {
 		context := manager.NewContext(toolbox.NewContext())
 		state := context.State()
 		if len(useCase.State) > 0 {

diff --git a/model/criteria/parser/criteria.go b/model/criteria/parser/criteria.go
@@ -10,7 +10,7 @@ func parseCriteria(cursor *parsly.Cursor, qualify *ast.Qualify) error {
 	binary := &ast.Binary{}
 	err := parseQualify(cursor, binary, false)
 	if binary.Op == "" && binary.Y == nil && binary.X != nil {
-		if unary, ok := binary.X.(*ast.Unary);ok {
+		if unary, ok := binary.X.(*ast.Unary); ok {
 			qualify.X = unary
 		} else {
 			qualify.X = &ast.Unary{X: binary.X, Op: ""}
@@ -77,20 +77,20 @@ func normalizeBinary(binary *ast.Binary) {
 	case "&&", "||":
 	default:
 		switch yOp := binary.Y.(type) {
-			case *ast.Binary:
-				swap := &ast.Binary{X: binary.X, Op: binary.Op, Y: yOp.X}
-				binary.Op = yOp.Op
-				binary.X = swap
-				binary.Y = yOp.Y
-				if binExpr, ok := binary.Y.(*ast.Binary); ok {
-					normalizeBinary(binExpr)
-				}
+		case *ast.Binary:
+			swap := &ast.Binary{X: binary.X, Op: binary.Op, Y: yOp.X}
+			binary.Op = yOp.Op
+			binary.X = swap
+			binary.Y = yOp.Y
+			if binExpr, ok := binary.Y.(*ast.Binary); ok {
+				normalizeBinary(binExpr)
+			}
 
 		}
 	}
 }
 
-var operands = []*parsly.Token{
+var defaultsOperands = []*parsly.Token{
 	boolLiteralMatcher,
 	doubleQuotedStringLiteralMatcher,
 	singleQuotedStringLiteralMatcher,
@@ -101,13 +101,17 @@ var operands = []*parsly.Token{
 	selectorMatcher,
 	parenthesesMatcher,
 	stringLiteralMatcher,
+	terminatorMatcher,
 }
 
 func expectOperand(cursor *parsly.Cursor) (ast.Node, error) {
+
 	var err error
 	pos := cursor.Pos
-	match := cursor.MatchAfterOptional(whitespaceMatcher, operands...)
+	match := cursor.MatchAfterOptional(whitespaceMatcher, defaultsOperands...)
 	switch match.Code {
+	case terminatorCode:
+		return &ast.Literal{Value: match.Text(cursor), Type: "string"}, nil
 	case boolLiteral:
 		return &ast.Literal{Value: match.Text(cursor), Type: "bool"}, nil
 	case stringLiteral:
@@ -138,11 +142,11 @@ func expectOperand(cursor *parsly.Cursor) (ast.Node, error) {
 		if err != nil || qualify == nil {
 			return nil, err
 		}
-		return &ast.Group{X:qualify.X}, nil
+		return &ast.Group{X: qualify.X}, nil
 	case parsly.EOF:
 		return nil, nil
 	case parsly.Invalid:
-		return nil, cursor.NewError(operands...)
+		return nil, cursor.NewError(defaultsOperands...)
 	default:
 		cursor.Pos = pos
 		return nil, nil

diff --git a/model/criteria/parser/declare.go b/model/criteria/parser/declare.go
@@ -7,7 +7,7 @@ import (
 
 func parseDeclare(input string, err error, cursor *parsly.Cursor, when string, expr string, elseExpr string) (string, string, string, error) {
 	binary := ast.Binary{}
-	err = parseQualify(cursor,   &binary, true)
+	err = parseQualify(cursor, &binary, true)
 	if err != nil {
 		err = nil
 		return "", "", input, nil
@@ -33,4 +33,3 @@ func parseDeclare(input string, err error, cursor *parsly.Cursor, when string, e
 	}
 	return when, expr, elseExpr, nil
 }
-
diff --git a/model/criteria/parser/lex.go b/model/criteria/parser/lex.go
@@ -26,6 +26,8 @@ const (
 
 	questionMark
 
+	terminatorCode
+
 	colon
 )
 
@@ -41,6 +43,7 @@ var doubleQuotedStringLiteralMatcher = parsly.NewToken(doubleQuotedStringLiteral
 var numericLiteralMatcher = parsly.NewToken(numericLiteral, `NUMERIC`, matcher.NewNumber())
 var stringLiteralMatcher = parsly.NewToken(stringLiteral, `STRING`, smatcher.NewFragment())
 var selectorMatcher = parsly.NewToken(selectorCode, "SELECTOR", smatcher.NewSelector())
+var terminatorMatcher = parsly.NewToken(terminatorCode, "/", matcher.NewTerminator('/', false))
 
 var questionMarkMatcher = parsly.NewToken(questionMark, "?", matcher.NewByte('?'))
 var colonMatcher = parsly.NewToken(colon, ":", matcher.NewByte(':'))
diff --git a/service/workflow/service.go b/service/workflow/service.go
@@ -432,6 +432,9 @@ func (s *Service) runNode(context *endly.Context, nodeType string, process *mode
 		context.Logging = original
 	}()
 	var state = context.State()
+	if strings.Contains(node.When, "Output") {
+		fmt.Printf("here")
+	}
 	canRun, err := criteria.Evaluate(context, context.State(), node.When, node.WhenEval(), fmt.Sprintf("%v.When", nodeType), true)
 	if err != nil || !canRun {
 		return err