Skip to content

Commit 250c983

Browse files
authored
Upgrade Core to 46e96ec6a5035cbac6a8babca8432990e0ac2bb9 (#502)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 71dbb0a commit 250c983

23 files changed

Lines changed: 1003 additions & 356 deletions

File tree

DEPENDENCIES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
2-
core https://github.com/sourcemeta/core 1f23fc7df56f41ceb140719bbcf94ee6f4d6f066
2+
core https://github.com/sourcemeta/core 46e96ec6a5035cbac6a8babca8432990e0ac2bb9
33
jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite 15e4505bf689de5d30c29d50782bb48fa465c93f

src/linter/valid_default.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ auto ValidDefault::condition(
5151
.get()
5252
.base_dialect};
5353
std::optional<std::string> default_id{location.base};
54-
if (sourcemeta::core::identify(root, root_base_dialect).has_value()) {
54+
if (sourcemeta::core::identify(root, root_base_dialect).has_value() ||
55+
default_id.value().empty()) {
5556
// We want to only set a default identifier if the root schema does not
5657
// have an explicit identifier. Otherwise, we can get into corner case
5758
// when wrapping the schema

src/linter/valid_examples.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ auto ValidExamples::condition(
5555
.get()
5656
.base_dialect};
5757
std::optional<std::string> default_id{location.base};
58-
if (sourcemeta::core::identify(root, root_base_dialect).has_value()) {
58+
if (sourcemeta::core::identify(root, root_base_dialect).has_value() ||
59+
default_id.value().empty()) {
5960
// We want to only set a default identifier if the root schema does not
6061
// have an explicit identifier. Otherwise, we can get into corner case
6162
// when wrapping the schema

vendor/core/CMakeLists.txt

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

vendor/core/config.cmake.in

Lines changed: 15 additions & 0 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: 4 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/bundle.cc

Lines changed: 11 additions & 0 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.h

Lines changed: 0 additions & 41 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_error.h

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

vendor/core/src/core/jsonschema/jsonschema.cc

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

0 commit comments

Comments
 (0)