Update to JSONPath4K 3.0.0

Author: nodh

CHANGELOG.md

@@ -68,6 +68,7 @@ Release 5.8.0:
        * Coroutines 1.10.2
        * Ktor 3.2.2
        * Kotest 6.0.0.M6
+   - Update JsonPath4K to 3.0.0
  - Disable bogus ios X64 test tasks
  - Help XCode to get its act together
  - Add a manual test workflow to try different kotlin/ksp/kotest versions

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ kotest= "6.0.0.M6"
 signum="3.17.0"
 supreme="0.9.0"
 uuid="0.8.1"
-jsonpath="2.4.1"
+jsonpath="3.0.0"
 jvmJson="20230618"
 jvmCbor="1.18"
 eupid="3.1.1-SNAPSHOT"

openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/dcql/DCQLClaimsPathPointerSegment.kt

@@ -3,7 +3,6 @@ package at.asitplus.openid.dcql
 import at.asitplus.catching
 import at.asitplus.jsonpath.core.NodeList
 import at.asitplus.jsonpath.core.NodeListEntry
-import at.asitplus.openid.third_party.at.asitplus.jsonpath.core.plus
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject

openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/third_party/at.asitplus/jsonpath/core/NormalizedJsonPath.kt

@@ -1,18 +1,38 @@
 package at.asitplus.wallet.lib.openid
 
 import at.asitplus.data.NonEmptyList.Companion.toNonEmptyList
-import at.asitplus.dif.*
+import at.asitplus.dif.Constraint
+import at.asitplus.dif.ConstraintField
+import at.asitplus.dif.ConstraintFilter
+import at.asitplus.dif.DifInputDescriptor
+import at.asitplus.dif.FormatContainerJwt
+import at.asitplus.dif.FormatContainerSdJwt
+import at.asitplus.dif.FormatHolder
+import at.asitplus.dif.InputDescriptor
+import at.asitplus.dif.PresentationDefinition
+import at.asitplus.dif.RequirementEnum
 import at.asitplus.jsonpath.core.NormalizedJsonPath
-import at.asitplus.jsonpath.core.NormalizedJsonPathSegment
-import at.asitplus.jsonpath.core.NormalizedJsonPathSegment.IndexSegment
 import at.asitplus.jsonpath.core.NormalizedJsonPathSegment.NameSegment
-import at.asitplus.openid.*
+import at.asitplus.openid.AuthenticationRequestParameters
+import at.asitplus.openid.CredentialFormatEnum
+import at.asitplus.openid.OpenIdConstants
 import at.asitplus.openid.OpenIdConstants.SCOPE_OPENID
 import at.asitplus.openid.OpenIdConstants.SCOPE_PROFILE
 import at.asitplus.openid.OpenIdConstants.VP_TOKEN
-import at.asitplus.openid.dcql.*
+import at.asitplus.openid.TransactionData
+import at.asitplus.openid.dcql.DCQLClaimsPathPointer
+import at.asitplus.openid.dcql.DCQLClaimsPathPointerSegment
+import at.asitplus.openid.dcql.DCQLClaimsQueryList
+import at.asitplus.openid.dcql.DCQLCredentialQueryIdentifier
+import at.asitplus.openid.dcql.DCQLCredentialQueryInstance
+import at.asitplus.openid.dcql.DCQLCredentialQueryList
+import at.asitplus.openid.dcql.DCQLIsoMdocClaimsQuery
+import at.asitplus.openid.dcql.DCQLIsoMdocCredentialMetadataAndValidityConstraints
+import at.asitplus.openid.dcql.DCQLJsonClaimsQuery
+import at.asitplus.openid.dcql.DCQLQuery
+import at.asitplus.openid.dcql.DCQLSdJwtCredentialMetadataAndValidityConstraints
 import at.asitplus.wallet.lib.agent.PresentationRequestParameters.Flow
-import at.asitplus.wallet.lib.data.*
+import at.asitplus.wallet.lib.data.ConstantIndex
 import at.asitplus.wallet.lib.data.ConstantIndex.CredentialRepresentation
 import at.asitplus.wallet.lib.data.ConstantIndex.supportsSdJwt
 import at.asitplus.wallet.lib.data.ConstantIndex.supportsVcJwt
@@ -282,22 +302,7 @@ data class RequestOptionsCredential(
 
     // EUDIW Reference Implementation only supports dot notation for JSONPath
     private fun String.splitByDotToJsonPath(): String =
-        NormalizedJsonPath(split(".").map { NameSegment(it) }).toDotNotation()
-
-    private fun NormalizedJsonPath.toDotNotation(): String =
-        "$" + segments.joinToString("") { it.toDotNotation() }
-
-    private fun NormalizedJsonPathSegment.toDotNotation(): CharSequence = when (this) {
-        is IndexSegment -> toString()
-        is NameSegment -> if (memberName.isValidForDotNotation()) ".$memberName" else toString()
-    }
-
-    private fun String.isValidForDotNotation(): Boolean =
-        firstOrNull().isLetterOrUnderscore() && all { it.isLetterOrDigit() || it.isUnderscore() }
-
-    private fun Char?.isLetterOrUnderscore(): Boolean = if (this == null) false else (isLetter() || this.isUnderscore())
-
-    private fun Char.isUnderscore(): Boolean = this == '_'
+        NormalizedJsonPath(split(".").map { NameSegment(it) }).toShorthandNameSegmentNotation()
 
     private fun ConstantIndex.CredentialScheme?.prefixWithIsoNamespace(attribute: String): String = NormalizedJsonPath(
         NameSegment(this?.isoNamespace ?: "mdoc"),

vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/openid/RequestOptions.kt

@@ -13,7 +13,6 @@ import at.asitplus.jsonpath.core.NormalizedJsonPath
 import at.asitplus.jsonpath.core.NormalizedJsonPathSegment
 import at.asitplus.openid.dcql.DCQLClaimsQueryResult
 import at.asitplus.openid.dcql.DCQLCredentialQueryMatchingResult
-import at.asitplus.openid.third_party.at.asitplus.jsonpath.core.plus
 import at.asitplus.signum.indispensable.cosef.io.ByteStringWrapper
 import at.asitplus.signum.indispensable.josef.JwsSigned
 import at.asitplus.wallet.lib.agent.SdJwtCreator.NAME_SD
@@ -24,13 +23,13 @@ import at.asitplus.wallet.lib.data.SelectiveDisclosureItem.Companion.hashDisclos
 import at.asitplus.wallet.lib.data.VerifiablePresentation
 import at.asitplus.wallet.lib.data.VerifiablePresentationJws
 import at.asitplus.wallet.lib.data.vckJsonSerializer
+import at.asitplus.wallet.lib.extensions.sdHashInput
 import at.asitplus.wallet.lib.jws.JwsContentTypeConstants
 import at.asitplus.wallet.lib.jws.JwsHeaderKeyId
 import at.asitplus.wallet.lib.jws.JwsHeaderNone
 import at.asitplus.wallet.lib.jws.SdJwtSigned
 import at.asitplus.wallet.lib.jws.SignJwt
 import at.asitplus.wallet.lib.jws.SignJwtFun
-import at.asitplus.wallet.lib.extensions.sdHashInput
 import io.github.aakira.napier.Napier
 import kotlin.time.Clock
 import kotlinx.serialization.json.JsonArray