Fully support JSON Schema 2020-12 (#149)

Signed-off-by: Juan Cruz Viotti <[email protected]>

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 7e26abce7a4e31e86a16ef2851702a56773ca527
-jsontoolkit https://github.com/sourcemeta/jsontoolkit e7a8f35b0b85cd87b5fa587b2ae767ed939a0b4d
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 00251a4161434463c24bc18418e3ffd37f998f29
 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc

README.markdown

@@ -29,7 +29,7 @@ We aim to fully support _every_ version of JSON Schema and combinations between
 
 | Dialect             | Support                                                          |
 |---------------------|------------------------------------------------------------------|
-| JSON Schema 2020-12 | Partial (except `validate`, `test`, `metaschema`, and `compile`) |
+| JSON Schema 2020-12 | **Full**                                                         |
 | JSON Schema 2019-09 | **Full**                                                         |
 | JSON Schema Draft 7 | **Full**                                                         |
 | JSON Schema Draft 6 | **Full**                                                         |

docs/compile.markdown

@@ -2,9 +2,7 @@ Compile
 =======
 
 > [!WARNING]
-> Only JSON Schema Draft 4, Draft 6, Draft 7, and 2019-09 are supported at this
-> point in time. We have plans to support *every* dialect of JSON Schema from
-> Draft 0 to Draft 2020-12 soon.
+> JSON Schema Draft 3 and older are not supported at this point in time.
 
 ```sh
 jsonschema compile <schema.json>

docs/metaschema.markdown

@@ -2,9 +2,7 @@ Metaschema
 ==========
 
 > [!WARNING]
-> Only JSON Schema Draft 4, Draft 6, Draft 7, and 2019-09 are supported at this
-> point in time. We have plans to support *every* dialect of JSON Schema from
-> Draft 0 to Draft 2020-12 soon.
+> JSON Schema Draft 3 and older are not supported at this point in time.
 
 ```sh
 jsonschema metaschema [schemas-or-directories...]

docs/test.markdown

@@ -2,9 +2,7 @@ Testing
 =======
 
 > [!WARNING]
-> Only JSON Schema Draft 4, Draft 6, Draft 7, and 2019-09 are supported at this
-> point in time. We have plans to support *every* dialect of JSON Schema from
-> Draft 0 to Draft 2020-12 soon.
+> JSON Schema Draft 3 and older are not supported at this point in time.
 
 ```sh
 jsonschema test [schemas-or-directories...]

docs/validate.markdown

@@ -2,9 +2,7 @@ Validating
 ==========
 
 > [!WARNING]
-> Only JSON Schema Draft 4, Draft 6, Draft 7, and 2019-09 are supported at this
-> point in time. We have plans to support *every* dialect of JSON Schema from
-> Draft 0 to Draft 2020-12 soon.
+> JSON Schema Draft 3 and older are not supported at this point in time.
 
 ```sh
 jsonschema validate <schema.json> <instance.json|.jsonl...> [--http/-h]

test/CMakeLists.txt

@@ -33,6 +33,7 @@ add_jsonschema_test_unix(metaschema_fail_single)
 add_jsonschema_test_unix(metaschema_fail_non_schema)
 add_jsonschema_test_unix(metaschema_pass_cwd)
 add_jsonschema_test_unix(metaschema_pass_single)
+add_jsonschema_test_unix(metaschema_pass_2020_12)
 
 # Validate
 add_jsonschema_test_unix(validate/fail_instance_directory)
@@ -58,10 +59,12 @@ add_jsonschema_test_unix(validate/pass_draft4)
 add_jsonschema_test_unix(validate/pass_draft6)
 add_jsonschema_test_unix(validate/pass_draft7)
 add_jsonschema_test_unix(validate/pass_2019_09)
+add_jsonschema_test_unix(validate/pass_2020_12)
 add_jsonschema_test_unix(validate/fail_draft4)
 add_jsonschema_test_unix(validate/fail_draft6)
 add_jsonschema_test_unix(validate/fail_draft7)
 add_jsonschema_test_unix(validate/fail_2019_09)
+add_jsonschema_test_unix(validate/fail_2020_12)
 add_jsonschema_test_unix(validate/pass_jsonl)
 add_jsonschema_test_unix(validate/pass_jsonl_verbose)
 add_jsonschema_test_unix(validate/fail_jsonl_invalid_entry)

test/metaschema_pass_2020_12.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "string"
+}
+EOF
+
+"$1" metaschema "$TMP/schema.json"

test/validate/fail_2020_12.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "foo": {
+      "type": "string"
+    }
+  }
+}
+EOF
+
+cat << 'EOF' > "$TMP/instance.json"
+{ "foo": 1 }
+EOF
+
+"$1" validate "$TMP/schema.json" "$TMP/instance.json" 2> "$TMP/stderr.txt" \
+  && CODE="$?" || CODE="$?"
+test "$CODE" = "1" || exit 1
+
+cat << EOF > "$TMP/expected.txt"
+fail: $(realpath "$TMP")/instance.json
+error: Schema validation failure
+  The target document is expected to be of the given type
+    at instance location "/foo"
+    at evaluate path "/properties/foo/type"
+  The target is expected to match all of the given assertions
+    at instance location ""
+    at evaluate path "/properties"
+EOF
+
+diff "$TMP/stderr.txt" "$TMP/expected.txt"

test/validate/fail_relative_external_ref_missing.sh

@@ -11,7 +11,9 @@ cat << 'EOF' > "$TMP/schema.json"
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "id": "https://example.com",
-  "$ref": "nested"
+  "allOf": [
+    { "$ref": "nested" }
+  ]
 }
 EOF
 

test/validate/pass_2020_12.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "properties": {
+    "foo": {
+      "type": "string"
+    }
+  }
+}
+EOF
+
+cat << 'EOF' > "$TMP/instance.json"
+{ "foo": "bar" }
+EOF
+
+"$1" validate "$TMP/schema.json" "$TMP/instance.json"