Bump test-suites/schema-test-suite from e99b24c to be58fa9 (#356)

Bumps
[test-suites/schema-test-suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite)
from `e99b24c` to `be58fa9`.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/be58fa98d5f79bb8d20f45a15e540332669ad947"><code>be58fa9</code></a>
Merge pull request <a
href="https://redirect.github.com/json-schema-org/JSON-Schema-Test-Suite/issues/791">#791</a>
from json-schema-org/ether/fix-draft-next-removal</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/acaece38e8d5f2373052c77110159db5c11b63a9"><code>acaece3</code></a>
stop using the term &quot;draft&quot; to mean &quot;version&quot;, and
fix the remaining mentions...</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/980e10529f4aba741403a8466cace29a97e67a22"><code>980e105</code></a>
Merge pull request <a
href="https://redirect.github.com/json-schema-org/JSON-Schema-Test-Suite/issues/790">#790</a>
from dylankerr-bis/add-test-sibling-nested-ref-id</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/b5037ed7ac94f2da1865969c95f700259c347822"><code>b5037ed</code></a>
Add test for sibling $ref and $id in nested schema to v1 suite</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/4cf559962d6dd01aa576e9b8889d771df70d9e50"><code>4cf5599</code></a>
Merge pull request <a
href="https://redirect.github.com/json-schema-org/JSON-Schema-Test-Suite/issues/776">#776</a>
from davishmcclurg/idn-hostname-separators</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/a930db4328776cb9fe4ef9297912dacf5157366b"><code>a930db4</code></a>
Shorten test descriptions to appease ci</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/aab08752cf060a333bc44e68ad7294aa20024107"><code>aab0875</code></a>
Updates form PR feedback</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/081a16a76aff9921c54cc549508ce8afaf768483"><code>081a16a</code></a>
Test IDN label separators separate labels</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/658c8cf9f355b9b4e378d4af7201638f1cf802e2"><code>658c8cf</code></a>
Test IDN label separator in <code>hostname</code> format</li>
<li><a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/commit/38c04b830a2aa4fa388ec48501268069ef02b432"><code>38c04b8</code></a>
Test label separator position in hostname formats</li>
<li>Additional commits viewable in <a
href="https://github.com/json-schema-org/JSON-Schema-Test-Suite/compare/e99b24c92006fd83803be511d77278910986d6aa...be58fa98d5f79bb8d20f45a15e540332669ad947">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Oleg Smirnov <oleg31101996@gmail.com>

Author: dependabot[bot]

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/SchemaLoader.kt

@@ -712,8 +712,46 @@ private fun Uri.appendPathToParent(path: String): Uri {
       }
   }.appendEncodedPath(path)
     .build()
+    .normalizeUri()
 }
 
+private fun Uri.normalizeUri(): Uri {
+  if (pathSegments.none { it in RELATIVE_PATH_SEGMENTS }) {
+    // Nothing to normalize
+    return this
+  }
+
+  val newPathSegments = ArrayDeque<String>()
+  for (segment in pathSegments) {
+    when (segment) {
+      SAME_LEVEL_SEGMENT -> { // skip
+      }
+
+      PARENT_LEVEL_SEGMENT ->
+        if (newPathSegments.isEmpty()) {
+          error("cannot normalize URI '$this'. Path goes beyond root")
+        } else {
+          newPathSegments.removeLast()
+        }
+
+      else -> newPathSegments.addLast(segment)
+    }
+  }
+
+  return buildUpon()
+    .encodedPath(null)
+    .apply {
+      for (segment in newPathSegments) {
+        appendEncodedPath(segment)
+      }
+    }.build()
+}
+
+private const val SAME_LEVEL_SEGMENT = "."
+private const val PARENT_LEVEL_SEGMENT = ".."
+
+private val RELATIVE_PATH_SEGMENTS = setOf(SAME_LEVEL_SEGMENT, PARENT_LEVEL_SEGMENT)
+
 private val ANCHOR_REGEX: Regex = "^[A-Za-z][A-Za-z0-9-_:.]*$".toRegex()
 
 private fun Uri.buildRefId(): RefId = RefId(this)

json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/formats/IdnHostnameFormatValidator.kt

@@ -48,7 +48,7 @@ internal object IdnHostnameFormatValidator : AbstractStringFormatValidator() {
     if (value.isEmpty()) {
       return FormatValidator.Invalid()
     }
-    if (value.length == 1 && isLabelSeparator(value[0])) {
+    if (isLabelSeparator(value[0]) || isLabelSeparator(value[value.lastIndex])) {
       return FormatValidator.Invalid()
     }
 
@@ -113,6 +113,11 @@ internal object IdnHostnameFormatValidator : AbstractStringFormatValidator() {
       return false
     }
 
+    if (unicode.isEmpty()) {
+      // empty labels are not valid
+      return false
+    }
+
     // https://datatracker.ietf.org/doc/html/rfc5891#section-4.2.3.1
     if (unicode[0] == '-' || unicode.codePointBefore(unicode.length) == '-'.code) {
       // cannot start or end with hyphen

json-schema-validator/src/commonTest/kotlin/io/github/optimumcode/json/schema/assertions/general/format/JsonSchemaIdnHostnameFormatValidationTest.kt

@@ -33,6 +33,9 @@ class JsonSchemaIdnHostnameFormatValidationTest : FunSpec() {
         listOf(
           TestCase("", "empty value"),
           TestCase(".", "single separator"),
+          TestCase(".example", "leading separator"),
+          TestCase("example.", "trailing separator"),
+          TestCase("example..com", "two separators in a row"),
           TestCase("\u3002", "single separator U+3002"),
           TestCase("\uFF0E", "single separator U+FF0E"),
           TestCase("\uFF61", "single separator U+FF61"),

json-schema-validator/src/commonTest/kotlin/io/github/optimumcode/json/schema/base/JsonSchemaTest.kt

@@ -115,6 +115,7 @@ class JsonSchemaTest : FunSpec() {
           "http://example.com/other.json",
           "http://example.com/other.json#",
           "http://example.com/root.json#/definitions/B",
+          "./other.json",
         ),
       "definition X" to
         listOf(
@@ -136,7 +137,8 @@ class JsonSchemaTest : FunSpec() {
           "http://example.com/root.json#/definitions/C",
         ),
     ).forEach { (refDestination, possibleRefs) ->
-      possibleRefs.asSequence()
+      possibleRefs
+        .asSequence()
         .flatMapIndexed { index, ref ->
           val uri = Uri.parse(ref)
           val caseNumber = index + 1