Skip to content

Commit eb00206

Browse files
authored
Improve the lint description of the unknown_keywords_prefix rule (#559)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent 4a5c3f2 commit eb00206

File tree

16 files changed

+505
-91
lines changed

16 files changed

+505
-91
lines changed

DEPENDENCIES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
2-
core https://github.com/sourcemeta/core eababe4f4a967bfa546146c8531b8668913a3880
2+
core https://github.com/sourcemeta/core 7072e2109db2d1ca504c3ceab7a61dcf1397aaee
33
jsonbinpack https://github.com/sourcemeta/jsonbinpack abd40e41050d14d74af1fddb5c397de5cca3b13c
4-
blaze https://github.com/sourcemeta/blaze bfdc479b5ae0c17a356be5f42dcc713ab31f976a
4+
blaze https://github.com/sourcemeta/blaze 53d6ba77c26e613b2803f044c2852d4441bfb0a1
55
hydra https://github.com/sourcemeta/hydra af9f2c54709d620872ead0c3f8f683c15a0fa702

test/lint/fail_lint_positions.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ test "$CODE" = "2" || exit 1
2424

2525
cat << EOF > "$TMP/expected.txt"
2626
schema.json:4:5:
27-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix (unknown_keywords_prefix)
27+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix (unknown_keywords_prefix)
2828
at location "/additionalProperties/unknown-1"
2929
schema.json:5:5:
30-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix (unknown_keywords_prefix)
30+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix (unknown_keywords_prefix)
3131
at location "/additionalProperties/unknown-2"
3232
schema.json:6:5:
33-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix (unknown_keywords_prefix)
33+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix (unknown_keywords_prefix)
3434
at location "/additionalProperties/unknown-3"
3535
EOF
3636

test/lint/fail_lint_positions_json.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@ cat << EOF > "$TMP/expected.json"
2929
{
3030
"path": "$(realpath "$TMP")/schema.json",
3131
"id": "unknown_keywords_prefix",
32-
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix",
32+
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix",
3333
"description": null,
3434
"schemaLocation": "/additionalProperties/unknown-1",
3535
"position": [ 4, 5, 4, 18 ]
3636
},
3737
{
3838
"path": "$(realpath "$TMP")/schema.json",
3939
"id": "unknown_keywords_prefix",
40-
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix",
40+
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix",
4141
"description": null,
4242
"schemaLocation": "/additionalProperties/unknown-2",
4343
"position": [ 5, 5, 5, 18 ]
4444
},
4545
{
4646
"path": "$(realpath "$TMP")/schema.json",
4747
"id": "unknown_keywords_prefix",
48-
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix",
48+
"message": "Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix",
4949
"description": null,
5050
"schemaLocation": "/additionalProperties/unknown-3",
5151
"position": [ 6, 5, 6, 18 ]

test/lint/pass_lint_list_exclude.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ unevaluated_properties_default
152152
Setting the `unevaluatedProperties` keyword to the true schema does not add any further constraint
153153
154154
unknown_keywords_prefix
155-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix
155+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix
156156
157157
unknown_local_ref
158158
Local references that point to unknown locations are invalid and will result in evaluation failures

test/lint/pass_lint_list_long.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ unevaluated_properties_default
158158
Setting the `unevaluatedProperties` keyword to the true schema does not add any further constraint
159159
160160
unknown_keywords_prefix
161-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix
161+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix
162162
163163
unknown_local_ref
164164
Local references that point to unknown locations are invalid and will result in evaluation failures

test/lint/pass_lint_list_short.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ unevaluated_properties_default
158158
Setting the `unevaluatedProperties` keyword to the true schema does not add any further constraint
159159
160160
unknown_keywords_prefix
161-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix
161+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix
162162
163163
unknown_local_ref
164164
Local references that point to unknown locations are invalid and will result in evaluation failures

test/lint/pass_lint_list_strict.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ unevaluated_properties_default
161161
Setting the `unevaluatedProperties` keyword to the true schema does not add any further constraint
162162
163163
unknown_keywords_prefix
164-
Future versions of JSON Schema will refuse to evaluate unknown keywords that don't have an x- prefix
164+
Future versions of JSON Schema will refuse to evaluate unknown keywords or custom keywords from optional vocabularies that don't have an x- prefix
165165
166166
unknown_local_ref
167167
Local references that point to unknown locations are invalid and will result in evaluation failures

vendor/blaze/src/compiler/default_compiler.cc

Lines changed: 27 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/core/src/core/jsonschema/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/core/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h

Lines changed: 7 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)