Add: Finalize compiler

a-sit-plus · Apr 22, 2024 · c624345 · c624345
1 parent 8667f62
commit c624345
Show file tree

Hide file tree

Showing 10 changed files with 407 additions and 166 deletions.
diff --git a/...n/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathExpressionEvaluationVisitor.kt b/...n/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathExpressionEvaluationVisitor.kt
@@ -134,8 +134,27 @@ class AntlrJsonPathExpressionEvaluationVisitor(
         second: JsonPathExpressionValue.ValueTypeValue,
     ): Boolean = when (first) {
         is JsonPathExpressionValue.ValueTypeValue.JsonValue -> {
-            when (first.jsonElement) {
-                is JsonArray -> if (second is JsonPathExpressionValue.ValueTypeValue.JsonValue) {
+            if (second !is JsonPathExpressionValue.ValueTypeValue.JsonValue) {
+                false
+            } else when (first.jsonElement) {
+                JsonNull -> {
+                    second.jsonElement == JsonNull
+                }
+
+                is JsonPrimitive -> {
+                    if (second.jsonElement is JsonPrimitive) {
+                        when {
+                            first.jsonElement.isString != second.jsonElement.isString -> false
+                            first.jsonElement.isString -> first.jsonElement.content == second.jsonElement.content
+                            else -> first.jsonElement.booleanOrNull?.let { it == second.jsonElement.booleanOrNull }
+                                ?: first.jsonElement.longOrNull?.let { it == second.jsonElement.longOrNull }
+                                ?: first.jsonElement.doubleOrNull?.let { it == second.jsonElement.doubleOrNull }
+                                ?: false
+                        }
+                    } else false
+                }
+
+                is JsonArray -> {
                     if (second.jsonElement is JsonArray) {
                         (first.jsonElement.size == second.jsonElement.size) and first.jsonElement.mapIndexed { index, it ->
                             index to it
@@ -146,9 +165,9 @@ class AntlrJsonPathExpressionEvaluationVisitor(
                             )
                         }
                     } else false
-                } else false
+                }
 
-                is JsonObject -> if (second is JsonPathExpressionValue.ValueTypeValue.JsonValue) {
+                is JsonObject -> {
                     if (second.jsonElement is JsonObject) {
                         (first.jsonElement.keys == second.jsonElement.keys) and first.jsonElement.entries.all {
                             this.evaluateComparisonEqualsUnpacked(
@@ -163,24 +182,7 @@ class AntlrJsonPathExpressionEvaluationVisitor(
                             )
                         }
                     } else false
-                } else false
-
-                is JsonPrimitive -> if (second is JsonPathExpressionValue.ValueTypeValue.JsonValue) {
-                    if (second.jsonElement is JsonPrimitive) {
-                        when {
-                            first.jsonElement.isString != second.jsonElement.isString -> false
-                            first.jsonElement.isString -> first.jsonElement.content == second.jsonElement.content
-                            else -> first.jsonElement.booleanOrNull?.let { it == second.jsonElement.booleanOrNull }
-                                ?: first.jsonElement.longOrNull?.let { it == second.jsonElement.longOrNull }
-                                ?: first.jsonElement.doubleOrNull?.let { it == second.jsonElement.doubleOrNull }
-                                ?: false
-                        }
-                    } else false
-                } else false
-
-                JsonNull -> if (second is JsonPathExpressionValue.ValueTypeValue.JsonValue) {
-                    second.jsonElement == JsonNull
-                } else false
+                }
             }
         }
 

diff --git a/...c/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathParserExtensions.kt b/...c/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathParserExtensions.kt
@@ -3,6 +3,6 @@ package at.asitplus.wallet.lib.data.jsonPath
 import at.asitplus.parser.generated.JsonPathParser
 
 fun JsonPathParser.StringLiteralContext.toUnescapedString(): String {
-    return rfc9535Utils.unpackStringLiteral(this.text)
+    return Rfc9535Utils.unpackStringLiteral(this.text)
 }
 
diff --git a/...ain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathTypeCheckerExpressionType.kt b/...ain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathTypeCheckerExpressionType.kt
@@ -15,5 +15,6 @@ sealed class AntlrJsonPathTypeCheckerExpressionType(val jsonPathExpressionType:
         data object FunctionNodesType : NodesType()
     }
 
+    data object NoType : AntlrJsonPathTypeCheckerExpressionType(null)
     data object ErrorType : AntlrJsonPathTypeCheckerExpressionType(null)
 }
diff --git a/...commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathTypeCheckerVisitor.kt b/...commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/AntlrJsonPathTypeCheckerVisitor.kt
@@ -11,6 +11,9 @@ class AntlrJsonPathTypeCheckerVisitor(
     // see section 2.4.3: Well-Typedness of Function Expressions
     // - https://datatracker.ietf.org/doc/rfc9535/
 
+    override fun defaultResult(): AntlrJsonPathTypeCheckerExpressionType {
+        return AntlrJsonPathTypeCheckerExpressionType.NoType
+    }
     override fun aggregateResult(
         aggregate: AntlrJsonPathTypeCheckerExpressionType?,
         nextResult: AntlrJsonPathTypeCheckerExpressionType
@@ -61,6 +64,23 @@ class AntlrJsonPathTypeCheckerVisitor(
         return AntlrJsonPathTypeCheckerExpressionType.ValueType
     }
 
+    override fun visitTest_expr(ctx: JsonPathParser.Test_exprContext): AntlrJsonPathTypeCheckerExpressionType {
+        return ctx.function_expr()?.let { functionExpressionContext ->
+            when (visitFunction_expr(functionExpressionContext)) {
+                is AntlrJsonPathTypeCheckerExpressionType.ValueType -> {
+                    errorListener
+                        ?.invalidFunctionExtensionForTestExpression(
+                            functionExpressionContext.FUNCTION_NAME().text,
+                        )
+                    AntlrJsonPathTypeCheckerExpressionType.ErrorType
+                }
+                is AntlrJsonPathTypeCheckerExpressionType.ErrorType -> AntlrJsonPathTypeCheckerExpressionType.ErrorType
+
+                else -> AntlrJsonPathTypeCheckerExpressionType.LogicalType
+            }
+        } ?: AntlrJsonPathTypeCheckerExpressionType.LogicalType // otherwise this is a filter query
+    }
+
     override fun visitFunction_expr(ctx: JsonPathParser.Function_exprContext): AntlrJsonPathTypeCheckerExpressionType {
         val functionArgumentTypes = ctx.function_argument().map {
             visitFunction_argument(it)
@@ -123,23 +143,6 @@ class AntlrJsonPathTypeCheckerVisitor(
         }
     }
 
-    override fun visitTest_expr(ctx: JsonPathParser.Test_exprContext): AntlrJsonPathTypeCheckerExpressionType {
-        return ctx.function_expr()?.let { functionExpressionContext ->
-            when (visitFunction_expr(functionExpressionContext)) {
-                is AntlrJsonPathTypeCheckerExpressionType.ValueType -> {
-                    errorListener
-                        ?.invalidFunctionExtensionForTestExpression(
-                            functionExpressionContext.FUNCTION_NAME().text,
-                        )
-                    AntlrJsonPathTypeCheckerExpressionType.ErrorType
-                }
-                is AntlrJsonPathTypeCheckerExpressionType.ErrorType -> AntlrJsonPathTypeCheckerExpressionType.ErrorType
-
-                else -> AntlrJsonPathTypeCheckerExpressionType.LogicalType
-            }
-        } ?: AntlrJsonPathTypeCheckerExpressionType.LogicalType // otherwise this is a filter query
-    }
-
     override fun visitComparison_expr(ctx: JsonPathParser.Comparison_exprContext): AntlrJsonPathTypeCheckerExpressionType {
         // evaluate all comparables in order to find as many errors as possible
         // otherwise, a comparison always returns a boolean anyway

diff --git a/...ommonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/JsonPathFunctionExtensionManager.kt b/...ommonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/JsonPathFunctionExtensionManager.kt
@@ -8,27 +8,32 @@ import at.asitplus.wallet.lib.data.jsonPath.functionExtensions.ValueFunctionExte
 
 interface JsonPathFunctionExtensionManager {
     fun addExtension(functionExtension: JsonPathFunctionExtension<*>)
+    fun putExtension(functionExtension: JsonPathFunctionExtension<*>)
     fun removeExtension(functionExtensionName: String)
     fun getExtension(name: String): JsonPathFunctionExtension<*>?
 }
 
-val defaultFunctionExtensionManager: JsonPathFunctionExtensionManager by lazy {
+val defaultFunctionExtensionManager by lazy {
     object : JsonPathFunctionExtensionManager {
         private val extensions: MutableMap<String, JsonPathFunctionExtension<*>> = mutableMapOf()
 
         override fun addExtension(functionExtension: JsonPathFunctionExtension<*>) {
             if(extensions.containsKey(functionExtension.name)) {
                 throw FunctionExtensionCollisionException(functionExtension.name)
             }
-            extensions.put(functionExtension.name, functionExtension)
+            extensions[functionExtension.name] = functionExtension
+        }
+
+        override fun putExtension(functionExtension: JsonPathFunctionExtension<*>) {
+            extensions[functionExtension.name] = functionExtension
         }
 
         override fun removeExtension(functionExtensionName: String) {
             extensions.remove(functionExtensionName)
         }
 
         override fun getExtension(name: String): JsonPathFunctionExtension<*>? {
-            return extensions.get(name)
+            return extensions[name]
         }
     }.apply {
         addExtension(LengthFunctionExtension)

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/Rfc8259Utils.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/Rfc8259Utils.kt
@@ -6,13 +6,8 @@ import org.antlr.v4.kotlinruntime.CharStreams
 import org.antlr.v4.kotlinruntime.CommonTokenStream
 
 interface Rfc8259Utils {
-
-    fun unpackStringLiteral(string: String): String
-}
-
-val rfc8259Utils by lazy {
-    object : Rfc8259Utils {
-        override fun unpackStringLiteral(string: String): String {
+    companion object {
+        fun unpackStringLiteral(string: String): String {
             val lexer = JsonStringLiteralLexer(CharStreams.fromString(string)).apply {
                 addErrorListener(NapierAntlrErrorListener("JSONStringLiteralLexer"))
             }

diff --git a/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/Rfc9535Utils.kt b/vclib/src/commonMain/kotlin/at/asitplus/wallet/lib/data/jsonPath/Rfc9535Utils.kt
@@ -1,12 +1,8 @@
 package at.asitplus.wallet.lib.data.jsonPath
 
 interface Rfc9535Utils {
-    fun unpackStringLiteral(string: String): String
-}
-
-val rfc9535Utils by lazy {
-    object : Rfc9535Utils {
-        override fun unpackStringLiteral(string: String): String {
+    companion object {
+        fun unpackStringLiteral(string: String): String {
             val doubleQuotedString = if (string.startsWith("\"")) {
                 string // treat as normal rfc8259 double quoted string
             } else {
@@ -18,7 +14,7 @@ val rfc9535Utils by lazy {
                         "\"$it\""
                     }
             }
-            return rfc8259Utils.unpackStringLiteral(doubleQuotedString)
+            return Rfc8259Utils.unpackStringLiteral(doubleQuotedString)
         }
     }
 }
diff --git a/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/agent/AgentSdJwtTest.kt b/vclib/src/commonTest/kotlin/at/asitplus/wallet/lib/agent/AgentSdJwtTest.kt
@@ -55,7 +55,7 @@ class AgentSdJwtTest : FreeSpec({
                             constraints = Constraint(
                                 fields = listOf(
                                     ConstraintField(
-                                        path = listOf("$.given-name")
+                                        path = listOf("$['given-name']")
                                     )
                                 )
                             )
@@ -89,7 +89,7 @@ class AgentSdJwtTest : FreeSpec({
                         constraints = Constraint(
                             fields = listOf(
                                 ConstraintField(
-                                    path = listOf("$.given-name")
+                                    path = listOf("$['given-name']")
                                 )
                             )
                         )
@@ -125,7 +125,7 @@ class AgentSdJwtTest : FreeSpec({
                         constraints = Constraint(
                             fields = listOf(
                                 ConstraintField(
-                                    path = listOf("$.given-name")
+                                    path = listOf("$['given-name']")
                                 )
                             )
                         )
@@ -155,7 +155,7 @@ class AgentSdJwtTest : FreeSpec({
                         constraints = Constraint(
                             fields = listOf(
                                 ConstraintField(
-                                    path = listOf("$.given-name")
+                                    path = listOf("$['given-name']")
                                 )
                             )
                         )