Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ sourcemeta_target_shellcheck(SOURCES test/*.sh docker/*.sh)

set(SOURCEMETA_SCHEMAS "${PROJECT_SOURCE_DIR}/collections/sourcemeta/one/schemas")
add_custom_target(jsonschema_fmt_test
COMMAND "$<TARGET_FILE:jsonschema_cli>" fmt --check --verbose ${SOURCEMETA_SCHEMAS})
COMMAND "$<TARGET_FILE:jsonschema_cli>" fmt --check ${SOURCEMETA_SCHEMAS})
add_custom_target(jsonschema_fmt
COMMAND "$<TARGET_FILE:jsonschema_cli>" fmt --verbose ${SOURCEMETA_SCHEMAS})
COMMAND "$<TARGET_FILE:jsonschema_cli>" fmt ${SOURCEMETA_SCHEMAS})
add_custom_target(jsonschema_metaschema
COMMAND "$<TARGET_FILE:jsonschema_cli>" metaschema --verbose ${SOURCEMETA_SCHEMAS})
COMMAND "$<TARGET_FILE:jsonschema_cli>" metaschema ${SOURCEMETA_SCHEMAS})
add_custom_target(jsonschema_lint
COMMAND "$<TARGET_FILE:jsonschema_cli>" lint --verbose
COMMAND "$<TARGET_FILE:jsonschema_cli>" lint --exclude simple_properties_identifiers
${SOURCEMETA_SCHEMAS})

if(ONE_TESTS)
Expand Down
8 changes: 4 additions & 4 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
uwebsockets https://github.com/uNetworking/uWebSockets v20.74.0
core https://github.com/sourcemeta/core d43595afeb1849fb649f7257048b488fcd6ac3e8
blaze https://github.com/sourcemeta/blaze 9c95799ec015db97a7bfaf44d390ae8d67932a60
jsonbinpack https://github.com/sourcemeta/jsonbinpack 2f865f340f58dc0e00b4892eb7334739c5d6ec67
core https://github.com/sourcemeta/core 550fcd3596d401148148196f2b8ffa5232e93bd7
blaze https://github.com/sourcemeta/blaze cd5ebdb49d7d5fac151f7ed89810908d22198e42
jsonbinpack https://github.com/sourcemeta/jsonbinpack 8fae212dc7ec02af4bb0cd4e7fccd42a2471f1c1
hydra https://github.com/sourcemeta/hydra af9f2c54709d620872ead0c3f8f683c15a0fa702
jsonschema https://github.com/sourcemeta/jsonschema v13.2.0
jsonschema https://github.com/sourcemeta/jsonschema v13.5.0
bootstrap https://github.com/twbs/bootstrap v5.3.3
bootstrap-icons https://github.com/twbs/icons v1.11.3
collections/sourcemeta/std/v0 https://github.com/sourcemeta/std 3f8746fb22ac70494ea3e3075cc19ee5d770ced7
Expand Down
3 changes: 1 addition & 2 deletions src/index/generators.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,7 @@ struct GENERATE_HEALTH {
const auto contents{sourcemeta::one::read_json(dependencies.front())};

sourcemeta::core::SchemaTransformer bundle;
sourcemeta::core::add(bundle,
sourcemeta::core::AlterSchemaMode::Readability);
sourcemeta::core::add(bundle, sourcemeta::core::AlterSchemaMode::Linter);
bundle.add<sourcemeta::blaze::ValidExamples>(
sourcemeta::blaze::default_schema_compiler);
bundle.add<sourcemeta::blaze::ValidDefault>(
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/populated/api/schemas-health.hurl
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ jsonpath "$.errors[1].pointers[0]" == ""
jsonpath "$.errors[1].name" == "top_level_examples"
jsonpath "$.errors[1].message" == "Set a non-empty examples array at the top level of the schema to illustrate the expected data"
jsonpath "$.errors[1].description" == null
jsonpath "$.errors[2].pointers" count == 1
jsonpath "$.errors[2].pointers" count == 2
jsonpath "$.errors[2].pointers[0]" == "/properties/type/enum"
jsonpath "$.errors[2].name" == "enum_to_const"
jsonpath "$.errors[2].message" == "An `enum` of a single value can be expressed as `const`"
jsonpath "$.errors[2].pointers[1]" == "/properties/type/type"
jsonpath "$.errors[2].name" == "enum_with_type"
jsonpath "$.errors[2].message" == "Setting `type` alongside `enum` is considered an anti-pattern, as the enumeration choices already imply their respective types"
jsonpath "$.errors[2].description" == null
jsonpath "$.errors[3].pointers" count == 2
jsonpath "$.errors[3].pointers" count == 1
jsonpath "$.errors[3].pointers[0]" == "/properties/type/enum"
jsonpath "$.errors[3].pointers[1]" == "/properties/type/type"
jsonpath "$.errors[3].name" == "enum_with_type"
jsonpath "$.errors[3].message" == "Setting `type` alongside `enum` is considered an anti-pattern, as the enumeration choices already imply their respective types"
jsonpath "$.errors[3].name" == "enum_to_const"
jsonpath "$.errors[3].message" == "An `enum` of a single value can be expressed as `const`"
jsonpath "$.errors[3].description" == null

POST {{base}}/self/api/schemas/evaluate/sourcemeta/one/api/schemas/health/response
Expand Down
10 changes: 8 additions & 2 deletions vendor/blaze/src/compiler/compile.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions vendor/blaze/src/evaluator/evaluator_describe.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/core/config.cmake.in

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/core/src/core/jsonpointer/CMakeLists.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/core/src/core/jsonpointer/jsonpointer.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading