Add: Improve organization

a-sit-plus · Apr 26, 2024 · 300de4b · 300de4b
1 parent e19cde4
commit 300de4b
Show file tree

Hide file tree

Showing 34 changed files with 152 additions and 88 deletions.
diff --git a/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPath.kt b/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPath.kt
@@ -1,5 +1,7 @@
 package at.asitplus.jsonpath
 
+import at.asitplus.jsonpath.core.JsonPathCompiler
+import at.asitplus.jsonpath.core.NodeList
 import kotlinx.serialization.json.JsonElement
 
 class JsonPath(

diff --git a/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathDependencyManager.kt b/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathDependencyManager.kt
@@ -1,18 +1,19 @@
 package at.asitplus.jsonpath
 
-import at.asitplus.jsonpath.functionExtensions.LengthFunctionExtension
-import at.asitplus.jsonpath.functionExtensions.MatchFunctionExtension
-import at.asitplus.jsonpath.functionExtensions.SearchFunctionExtension
-import at.asitplus.jsonpath.functionExtensions.ValueFunctionExtension
+import at.asitplus.jsonpath.implementation.AntlrJsonPathCompiler
+import at.asitplus.jsonpath.implementation.AntlrJsonPathCompilerErrorListener
+import at.asitplus.jsonpath.implementation.JsonPathExpression
+import at.asitplus.jsonpath.core.JsonPathCompiler
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.functionExtensions.LengthFunctionExtension
+import at.asitplus.jsonpath.core.functionExtensions.MatchFunctionExtension
+import at.asitplus.jsonpath.core.functionExtensions.SearchFunctionExtension
+import at.asitplus.jsonpath.core.functionExtensions.ValueFunctionExtension
 import at.asitplus.wallet.lib.data.jsonpath.functionExtensions.CountFunctionExtension
-import com.strumenta.antlrkotlin.runtime.BitSet
 import io.github.aakira.napier.Napier
 import org.antlr.v4.kotlinruntime.BaseErrorListener
-import org.antlr.v4.kotlinruntime.Parser
 import org.antlr.v4.kotlinruntime.RecognitionException
 import org.antlr.v4.kotlinruntime.Recognizer
-import org.antlr.v4.kotlinruntime.atn.ATNConfigSet
-import org.antlr.v4.kotlinruntime.dfa.DFA
 
 object JsonPathDependencyManager {
     /**

diff --git a/...path/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathFunctionExtensionMapRepository.kt b/...path/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathFunctionExtensionMapRepository.kt
@@ -1,5 +1,7 @@
 package at.asitplus.jsonpath
 
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
+
 class JsonPathFunctionExtensionMapRepository(
     private val extensions: MutableMap<String, JsonPathFunctionExtension<*>> = mutableMapOf()
 ) : JsonPathFunctionExtensionRepository {

diff --git a/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathFunctionExtensionRepository.kt b/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/JsonPathFunctionExtensionRepository.kt
@@ -1,5 +1,7 @@
 package at.asitplus.jsonpath
 
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
+
 /**
  * This class is not specified in the rfc standard, it's but an implementation detail.
  * It's a way to provide users with a way to add custom function extensions.

diff --git a/.../at/asitplus/jsonpath/JsonPathCompiler.kt → ...sitplus/jsonpath/core/JsonPathCompiler.kt b/.../at/asitplus/jsonpath/JsonPathCompiler.kt → ...sitplus/jsonpath/core/JsonPathCompiler.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 interface JsonPathCompiler {
     fun compile(jsonPath: String): JsonPathQuery

diff --git a/.../jsonpath/JsonPathFilterExpressionType.kt → ...path/core/JsonPathFilterExpressionType.kt b/.../jsonpath/JsonPathFilterExpressionType.kt → ...path/core/JsonPathFilterExpressionType.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 /**
  * specification: https://datatracker.ietf.org/doc/rfc9535/

diff --git a/...jsonpath/JsonPathFilterExpressionValue.kt → ...ath/core/JsonPathFilterExpressionValue.kt b/...jsonpath/JsonPathFilterExpressionValue.kt → ...ath/core/JsonPathFilterExpressionValue.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 import kotlinx.serialization.json.JsonElement
 
@@ -11,17 +11,21 @@ sealed interface JsonPathFilterExpressionValue {
     val expressionType: JsonPathFilterExpressionType
 
     sealed class ValueTypeValue : JsonPathFilterExpressionValue {
-        override val expressionType: JsonPathFilterExpressionType = JsonPathFilterExpressionType.ValueType
+        override val expressionType: JsonPathFilterExpressionType =
+            JsonPathFilterExpressionType.ValueType
         data class JsonValue(val jsonElement: JsonElement) : ValueTypeValue()
         data object Nothing : ValueTypeValue()
     }
 
     data class LogicalTypeValue(val isTrue: Boolean) : JsonPathFilterExpressionValue {
-        override val expressionType: JsonPathFilterExpressionType = JsonPathFilterExpressionType.LogicalType
+        override val expressionType: JsonPathFilterExpressionType =
+            JsonPathFilterExpressionType.LogicalType
     }
 
-    sealed class NodesTypeValue(open val nodeList: List<JsonElement>) : JsonPathFilterExpressionValue {
-        override val expressionType: JsonPathFilterExpressionType = JsonPathFilterExpressionType.NodesType
+    sealed class NodesTypeValue(open val nodeList: List<JsonElement>) :
+        JsonPathFilterExpressionValue {
+        override val expressionType: JsonPathFilterExpressionType =
+            JsonPathFilterExpressionType.NodesType
 
         sealed class FilterQueryResult(nodeList: List<JsonElement>): NodesTypeValue(nodeList) {
             data class SingularQueryResult(override val nodeList: List<JsonElement>): FilterQueryResult(nodeList)

diff --git a/...lus/jsonpath/JsonPathFunctionExtension.kt → ...sonpath/core/JsonPathFunctionExtension.kt b/...lus/jsonpath/JsonPathFunctionExtension.kt → ...sonpath/core/JsonPathFunctionExtension.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 /**
  * specification: https://datatracker.ietf.org/doc/rfc9535/

diff --git a/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/core/JsonPathQuery.kt b/jsonpath/src/commonMain/kotlin/at/asitplus/jsonpath/core/JsonPathQuery.kt
@@ -0,0 +1,7 @@
+package at.asitplus.jsonpath.core
+
+import kotlinx.serialization.json.JsonElement
+
+interface JsonPathQuery {
+    fun invoke(currentNode: JsonElement, rootNode: JsonElement = currentNode): NodeList
+}
diff --git a/.../at/asitplus/jsonpath/JsonPathSelector.kt → ...sitplus/jsonpath/core/JsonPathSelector.kt b/.../at/asitplus/jsonpath/JsonPathSelector.kt → ...sitplus/jsonpath/core/JsonPathSelector.kt
@@ -1,11 +1,7 @@
-package at.asitplus.wallet.lib.data.jsonpath
-
-import at.asitplus.jsonpath.JsonPathEvaluationContext
-import at.asitplus.jsonpath.NodeList
-import at.asitplus.jsonpath.NodeListEntry
-import at.asitplus.jsonpath.NormalizedJsonPath
-import at.asitplus.jsonpath.NormalizedJsonPathSegment.IndexSegment
-import at.asitplus.jsonpath.NormalizedJsonPathSegment.NameSegment
+package at.asitplus.jsonpath.core
+
+import at.asitplus.jsonpath.core.NormalizedJsonPathSegment.IndexSegment
+import at.asitplus.jsonpath.core.NormalizedJsonPathSegment.NameSegment
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
@@ -311,7 +307,7 @@ sealed interface JsonPathSelector {
      * section: 2.3.5.  Filter Selector
      */
     data class FilterSelector(
-        private val filterPredicate: (JsonPathEvaluationContext) -> Boolean,
+        private val filterPredicate: FilterPredicate,
     ) : JsonPathSelector {
         override fun invoke(
             currentNode: JsonElement,
@@ -335,12 +331,17 @@ sealed interface JsonPathSelector {
                 }
             }.filter {
                 filterPredicate.invoke(
-                    JsonPathEvaluationContext(
-                        currentNode = it.value,
-                        rootNode = rootNode,
-                    )
+                    currentNode = it.value,
+                    rootNode = rootNode,
                 )
             }
         }
     }
+}
+
+interface FilterPredicate {
+    fun invoke(
+        currentNode: JsonElement,
+        rootNode: JsonElement,
+    ): Boolean
 }
diff --git a/...n/kotlin/at/asitplus/jsonpath/NodeList.kt → ...lin/at/asitplus/jsonpath/core/NodeList.kt b/...n/kotlin/at/asitplus/jsonpath/NodeList.kt → ...lin/at/asitplus/jsonpath/core/NodeList.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 import kotlinx.serialization.json.JsonElement
 

diff --git a/...t/asitplus/jsonpath/NormalizedJsonPath.kt → ...tplus/jsonpath/core/NormalizedJsonPath.kt b/...t/asitplus/jsonpath/NormalizedJsonPath.kt → ...tplus/jsonpath/core/NormalizedJsonPath.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 /**
  * specification: https://datatracker.ietf.org/doc/rfc9535/

diff --git a/...lus/jsonpath/NormalizedJsonPathSegment.kt → ...sonpath/core/NormalizedJsonPathSegment.kt b/...lus/jsonpath/NormalizedJsonPathSegment.kt → ...sonpath/core/NormalizedJsonPathSegment.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 /**
  * specification: https://datatracker.ietf.org/doc/rfc9535/

diff --git a/...tlin/at/asitplus/jsonpath/Rfc8259Utils.kt → ...at/asitplus/jsonpath/core/Rfc8259Utils.kt b/...tlin/at/asitplus/jsonpath/Rfc8259Utils.kt → ...at/asitplus/jsonpath/core/Rfc8259Utils.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

diff --git a/...tlin/at/asitplus/jsonpath/Rfc9535Utils.kt → ...at/asitplus/jsonpath/core/Rfc9535Utils.kt b/...tlin/at/asitplus/jsonpath/Rfc9535Utils.kt → ...at/asitplus/jsonpath/core/Rfc9535Utils.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.core
 
 object Rfc9535Utils {
     fun switchToDoubleQuotedString(string: String) = if (string.startsWith("\"")) {

diff --git a/...ctionExtensions/CountFunctionExtension.kt → ...ctionExtensions/CountFunctionExtension.kt b/...ctionExtensions/CountFunctionExtension.kt → ...ctionExtensions/CountFunctionExtension.kt
@@ -1,8 +1,8 @@
 package at.asitplus.wallet.lib.data.jsonpath.functionExtensions
 
-import at.asitplus.jsonpath.JsonPathFilterExpressionValue
-import at.asitplus.jsonpath.JsonPathFilterExpressionType
-import at.asitplus.jsonpath.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.JsonPrimitive
 

diff --git a/...tionExtensions/LengthFunctionExtension.kt → ...tionExtensions/LengthFunctionExtension.kt b/...tionExtensions/LengthFunctionExtension.kt → ...tionExtensions/LengthFunctionExtension.kt
@@ -1,9 +1,8 @@
-package at.asitplus.jsonpath.functionExtensions
+package at.asitplus.jsonpath.core.functionExtensions
 
-import at.asitplus.jsonpath.JsonPathFilterExpressionType
-import at.asitplus.jsonpath.JsonPathFilterExpressionValue
-import at.asitplus.jsonpath.JsonPathFunctionExtension
-import com.strumenta.antlrkotlin.runtime.ext.codePointIndices
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
@@ -43,7 +42,15 @@ data object LengthFunctionExtension : JsonPathFunctionExtension.ValueTypeFunctio
 
             is JsonPrimitive -> if (argument.jsonElement.isString) {
                 JsonPathFilterExpressionValue.ValueTypeValue.JsonValue(
-                    JsonPrimitive(argument.jsonElement.content.codePointIndices().size.toUInt())
+                    JsonPrimitive(
+                        run {
+                            val codePoints =
+                                argument.jsonElement.content.count() + argument.jsonElement.content.count {
+                                    it.code > 0xffff
+                                }
+                            codePoints.toUInt()
+                        }
+                    )
                 )
             } else JsonPathFilterExpressionValue.ValueTypeValue.Nothing
         }

diff --git a/...ctionExtensions/MatchFunctionExtension.kt → ...ctionExtensions/MatchFunctionExtension.kt b/...ctionExtensions/MatchFunctionExtension.kt → ...ctionExtensions/MatchFunctionExtension.kt
@@ -1,8 +1,8 @@
-package at.asitplus.jsonpath.functionExtensions
+package at.asitplus.jsonpath.core.functionExtensions
 
-import at.asitplus.jsonpath.JsonPathFilterExpressionType
-import at.asitplus.jsonpath.JsonPathFilterExpressionValue
-import at.asitplus.jsonpath.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 import kotlinx.serialization.json.JsonPrimitive
 
 /**

diff --git a/...tionExtensions/SearchFunctionExtension.kt → ...tionExtensions/SearchFunctionExtension.kt b/...tionExtensions/SearchFunctionExtension.kt → ...tionExtensions/SearchFunctionExtension.kt
@@ -1,8 +1,8 @@
-package at.asitplus.jsonpath.functionExtensions
+package at.asitplus.jsonpath.core.functionExtensions
 
-import at.asitplus.jsonpath.JsonPathFilterExpressionType
-import at.asitplus.jsonpath.JsonPathFilterExpressionValue
-import at.asitplus.jsonpath.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 import kotlinx.serialization.json.JsonPrimitive
 
 /**

diff --git a/...ctionExtensions/ValueFunctionExtension.kt → ...ctionExtensions/ValueFunctionExtension.kt b/...ctionExtensions/ValueFunctionExtension.kt → ...ctionExtensions/ValueFunctionExtension.kt
@@ -1,8 +1,8 @@
-package at.asitplus.jsonpath.functionExtensions
+package at.asitplus.jsonpath.core.functionExtensions
 
-import at.asitplus.jsonpath.JsonPathFilterExpressionType
-import at.asitplus.jsonpath.JsonPathFilterExpressionValue
-import at.asitplus.jsonpath.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 
 /**
  * specification: https://datatracker.ietf.org/doc/rfc9535/

diff --git a/...t/asitplus/jsonpath/AbstractSyntaxTree.kt → ...path/implementation/AbstractSyntaxTree.kt b/...t/asitplus/jsonpath/AbstractSyntaxTree.kt → ...path/implementation/AbstractSyntaxTree.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
 import org.antlr.v4.kotlinruntime.ParserRuleContext
 import org.antlr.v4.kotlinruntime.Token

diff --git a/...sitplus/jsonpath/AntlrJsonPathCompiler.kt → ...h/implementation/AntlrJsonPathCompiler.kt b/...sitplus/jsonpath/AntlrJsonPathCompiler.kt → ...h/implementation/AntlrJsonPathCompiler.kt
@@ -1,5 +1,9 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
+import at.asitplus.jsonpath.core.JsonPathCompiler
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
+import at.asitplus.jsonpath.core.JsonPathQuery
+import at.asitplus.jsonpath.core.NodeList
 import at.asitplus.parser.generated.JsonPathLexer
 import at.asitplus.parser.generated.JsonPathParser
 import kotlinx.serialization.json.JsonElement

diff --git a/...ath/AntlrJsonPathCompilerErrorListener.kt → ...ion/AntlrJsonPathCompilerErrorListener.kt b/...ath/AntlrJsonPathCompilerErrorListener.kt → ...ion/AntlrJsonPathCompilerErrorListener.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
 import org.antlr.v4.kotlinruntime.ANTLRErrorListener
 

diff --git a/...sonpath/AntlrJsonPathCompilerException.kt → ...ntation/AntlrJsonPathCompilerException.kt b/...sonpath/AntlrJsonPathCompilerException.kt → ...ntation/AntlrJsonPathCompilerException.kt
@@ -1,5 +1,7 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.Rfc9535Utils
 import kotlinx.serialization.json.JsonObject
 import org.antlr.v4.kotlinruntime.ParserRuleContext
 
@@ -46,7 +48,11 @@ class InvalidComparableValueException(expression: ParserRuleContext, value: Json
 )
 
 class MissingKeyException(jsonObject: JsonObject, key: String) : JsonPathRuntimeException(
-    "Missing key ${Rfc9535Utils.escapeToDoubleQuoted(key)} at object ${Rfc9535Utils.escapeToDoubleQuoted(jsonObject.toString())}"
+    "Missing key ${Rfc9535Utils.escapeToDoubleQuoted(key)} at object ${
+        Rfc9535Utils.escapeToDoubleQuoted(
+            jsonObject.toString()
+        )
+    }"
 )
 
 class UnknownFunctionExtensionException(functionExtensionName: String) : JsonPathRuntimeException(

diff --git a/...jsonpath/AntlrJsonPathParserExtensions.kt → ...entation/AntlrJsonPathParserExtensions.kt b/...jsonpath/AntlrJsonPathParserExtensions.kt → ...entation/AntlrJsonPathParserExtensions.kt
@@ -1,5 +1,6 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
+import at.asitplus.jsonpath.core.Rfc9535Utils
 import at.asitplus.parser.generated.JsonPathParser
 
 fun JsonPathParser.StringLiteralContext.toUnescapedString(): String {

diff --git a/...rJsonPathSemanticAnalyzerErrorListener.kt → ...rJsonPathSemanticAnalyzerErrorListener.kt b/...rJsonPathSemanticAnalyzerErrorListener.kt → ...rJsonPathSemanticAnalyzerErrorListener.kt
@@ -1,4 +1,6 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
+
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 
 interface AntlrJsonPathSemanticAnalyzerErrorListener {
     fun unknownFunctionExtension(functionExtensionName: String)

diff --git a/...h/AntlrJsonPathSemanticAnalyzerVisitor.kt → ...n/AntlrJsonPathSemanticAnalyzerVisitor.kt b/...h/AntlrJsonPathSemanticAnalyzerVisitor.kt → ...n/AntlrJsonPathSemanticAnalyzerVisitor.kt
@@ -1,9 +1,14 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
+import at.asitplus.jsonpath.core.FilterPredicate
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionType
+import at.asitplus.jsonpath.core.JsonPathFilterExpressionValue
+import at.asitplus.jsonpath.core.JsonPathFunctionExtension
 import at.asitplus.parser.generated.JsonPathParser
 import at.asitplus.parser.generated.JsonPathParserBaseVisitor
-import at.asitplus.wallet.lib.data.jsonpath.JsonPathSelector
+import at.asitplus.jsonpath.core.JsonPathSelector
 import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -217,9 +222,19 @@ class AntlrJsonPathSemanticAnalyzerVisitor(
             context = ctx,
             value = if (logicalExpressionNode.value is JsonPathExpression.FilterExpression.LogicalExpression) {
                 JsonPathExpression.SelectorExpression(
-                    JsonPathSelector.FilterSelector { context ->
-                        logicalExpressionNode.value.evaluate(context).isTrue
-                    }
+                    JsonPathSelector.FilterSelector(
+                        object : FilterPredicate {
+                            override fun invoke(
+                                currentNode: JsonElement,
+                                rootNode: JsonElement
+                            ): Boolean = logicalExpressionNode.value.evaluate(
+                                JsonPathExpressionEvaluationContext(
+                                    currentNode = currentNode,
+                                    rootNode = rootNode,
+                                )
+                            ).isTrue
+                        }
+                    )
                 )
             } else JsonPathExpression.ErrorType,
             children = listOf(logicalExpressionNode)
@@ -545,8 +560,8 @@ class AntlrJsonPathSemanticAnalyzerVisitor(
     }
 
     private fun evaluateComparison(
-        firstComparable: (JsonPathEvaluationContext) -> JsonPathFilterExpressionValue.ValueTypeValue,
-        secondComparable: (JsonPathEvaluationContext) -> JsonPathFilterExpressionValue.ValueTypeValue,
+        firstComparable: (JsonPathExpressionEvaluationContext) -> JsonPathFilterExpressionValue.ValueTypeValue,
+        secondComparable: (JsonPathExpressionEvaluationContext) -> JsonPathFilterExpressionValue.ValueTypeValue,
         comparisonOpContext: JsonPathParser.ComparisonOpContext,
     ): JsonPathExpression = comparisonOpContext.let {
         when {

diff --git a/...plus/jsonpath/AntlrSyntaxErrorDetector.kt → ...mplementation/AntlrSyntaxErrorDetector.kt b/...plus/jsonpath/AntlrSyntaxErrorDetector.kt → ...mplementation/AntlrSyntaxErrorDetector.kt
@@ -1,4 +1,4 @@
-package at.asitplus.jsonpath
+package at.asitplus.jsonpath.implementation
 
 import org.antlr.v4.kotlinruntime.BaseErrorListener
 import org.antlr.v4.kotlinruntime.RecognitionException