[NU-1656] Check for methods if property does not exist (#6778)

* SpeL: Check for methods if property does not exist * Add brackets if suggested method has not empty parameters
TouK · Sep 6, 2024 · a51d594 · a51d594
1 parent cb7714d
commit a51d594
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/...er/client/src/components/graph/node-modal/editors/expression/CustomAceEditorCompleter.tsx b/...er/client/src/components/graph/node-modal/editors/expression/CustomAceEditorCompleter.tsx
@@ -80,6 +80,9 @@ const getNormalizedValue = (suggestion: ExpressionSuggestion): string => {
                 return `["${suggestion.methodName}"]`;
             }
     }
+    if (suggestion.parameters?.length > 0) {
+        return `${suggestion.methodName}()`;
+    }
     return suggestion.methodName;
 };
 

diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -14,7 +14,8 @@
 * [#6716](https://github.com/TouK/nussknacker/pull/6716) Fix type hints for #COLLECTION.merge function.
 * [#6695](https://github.com/TouK/nussknacker/pull/6680) From now on, arrays on UI are visible as lists but on a 
   background they are stored as it is and SpeL converts them to lists in a runtime.
-* [#6750](https://github.com/TouK/nussknacker/pull/6750) Add varargs to `#COLLECTION.concat` and `#COLLECTION.merge`. 
+* [#6750](https://github.com/TouK/nussknacker/pull/6750) Add varargs to `#COLLECTION.concat` and `#COLLECTION.merge`.
+* [#6778](https://github.com/TouK/nussknacker/pull/6778) SpeL: check for methods if a property for a given name does not exist.
 
 1.17.0 (Not released yet)
 -------------------------

diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala
@@ -30,7 +30,7 @@ import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.MissingObjectErr
   UnresolvedReferenceError
 }
 import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.OperatorError._
-import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.PartTypeError
+import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.{ArgumentTypeError, PartTypeError}
 import pl.touk.nussknacker.engine.spel.SpelExpressionParseError.SelectionProjectionError.{
   IllegalProjectionError,
   IllegalSelectionError,
@@ -434,6 +434,7 @@ private[spel] class Typer(
       case e: PropertyOrFieldReference =>
         current.stackHead
           .map(extractProperty(e, _))
+          .map(fallbackToCheckMethodsIfPropertyNotExists)
           .getOrElse(invalid(NonReferenceError(e.toStringAST)))
           .map(toNodeResult)
       // TODO: what should be here?
@@ -730,6 +731,16 @@ private[spel] class Typer(
     }
   }
 
+  private def fallbackToCheckMethodsIfPropertyNotExists(typing: TypingR[TypingResult]): TypingR[TypingResult] =
+    typing.mapWritten(_.map {
+      case e: NoPropertyError =>
+        methodReferenceTyper.typeMethodReference(typer.MethodReference(e.typ, false, e.property, Nil)) match {
+          case Left(me: ArgumentTypeError) => me
+          case _                           => e
+        }
+      case e => e
+    })
+
   private def valid[T](value: T): TypingR[T] = Writer(List.empty[ExpressionParseError], value)
 
   private def invalid[T](err: ExpressionParseError, fallbackType: TypingResult = Unknown): TypingR[TypingResult] =

diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSpec.scala
@@ -490,8 +490,15 @@ class SpelExpressionSpec extends AnyFunSuite with Matchers with ValidatedValuesD
   }
 
   test("return invalid type if PropertyOrFieldReference does not exists") {
+    val parsed             = parse[Any]("#processHelper.unknownProperty", ctxWithGlobal)
+    val expectedValidation = Invalid("There is no property 'unknownProperty' in type: SampleGlobalObject")
+    parsed.isInvalid shouldBe true
+    parsed.leftMap(_.head).leftMap(_.message) shouldEqual expectedValidation
+  }
+
+  test("return invalid argument if arguments is not passed to method") {
     val parsed             = parse[Any]("#processHelper.add", ctxWithGlobal)
-    val expectedValidation = Invalid("There is no property 'add' in type: SampleGlobalObject")
+    val expectedValidation = Invalid("Mismatch parameter types. Found: add(). Required: add(Integer, Integer)")
     parsed.isInvalid shouldBe true
     parsed.leftMap(_.head).leftMap(_.message) shouldEqual expectedValidation
   }
@@ -1328,6 +1335,15 @@ class SpelExpressionSpec extends AnyFunSuite with Matchers with ValidatedValuesD
       .evaluateSync[Any](ctx) shouldBe Array(false, false)
   }
 
+  test("should check if method exists as a fallback of not found property") {
+    parse[Any]("{1, 2}.contains", ctx).invalidValue.toList should matchPattern {
+      case ArgumentTypeError("contains", _, _) :: Nil =>
+    }
+    parse[Any]("{1, 2}.contain", ctx).invalidValue.toList should matchPattern {
+      case NoPropertyError(_, "contain") :: Nil =>
+    }
+  }
+
 }
 
 case class SampleObject(list: java.util.List[SampleValue])