Skip to content

Remove instance location information from the inspect command #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jviotti merged 1 commit into from
Dec 30, 2025
Merged

Remove instance location information from the inspect command #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
core https://github.com/sourcemeta/core 9985d96665aae0a8dfabf63f59b0732b92c64771
core https://github.com/sourcemeta/core 94ff49bd58ca63c5e5a7fb2435b3bc72872517c4
jsonbinpack https://github.com/sourcemeta/jsonbinpack 8fae212dc7ec02af4bb0cd4e7fccd42a2471f1c1
blaze https://github.com/sourcemeta/blaze 8dba65f8aebfe1ac976168b76e01c20dd406c517
hydra https://github.com/sourcemeta/hydra af9f2c54709d620872ead0c3f8f683c15a0fa702
Expand Down
15 changes: 1 addition & 14 deletions src/command_inspect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,6 @@ auto print_frame(std::ostream &stream,
stream << " Parent : <NONE>\n";
}

const auto &instance_locations{frame.instance_locations(location.second)};
if (!instance_locations.empty()) {
for (const auto &instance_location : instance_locations) {
if (instance_location.empty()) {
stream << " Instance Location :\n";
} else {
stream << " Instance Location : ";
sourcemeta::core::stringify(instance_location, stream);
stream << "\n";
}
}
}

if (std::next(iterator) != frame.locations().cend()) {
stream << "\n";
}
Expand Down Expand Up @@ -162,7 +149,7 @@ auto sourcemeta::jsonschema::inspect(const sourcemeta::core::Options &options)
const auto dialect{default_dialect(options, configuration)};

sourcemeta::core::SchemaFrame frame{
sourcemeta::core::SchemaFrame::Mode::Instances};
sourcemeta::core::SchemaFrame::Mode::References};

try {
const auto &custom_resolver{
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -56,7 +55,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
1 change: 0 additions & 1 deletion test/inspect/pass_custom_extension_json.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$id
Type : Static
Expand Down
1 change: 0 additions & 1 deletion test/inspect/pass_custom_extension_yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$id
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_default_dialect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -54,7 +53,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_default_dialect_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -59,7 +58,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_default_dialect_config_relative.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -61,7 +60,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_default_dialect_option_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -60,7 +59,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
6 changes: 1 addition & 5 deletions test/inspect/pass_json_output.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,7 @@ cat << 'EOF' > "$TMP/expected_json.txt"
"base": "https://json-schema.org/draft/2020-12/schema",
"fragment": null
}
],
"instances": {
"": [ "" ],
"/$defs/string": [ "" ]
}
]
}
EOF

Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_no_identifier.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ cat << EOF > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: file://$(realpath "$TMP")/schema.json#/\$defs
Type : Static
Expand All @@ -57,7 +56,6 @@ cat << EOF > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: file://$(realpath "$TMP")/schema.json#/\$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_without_extension_json.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -56,7 +55,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_without_extension_yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -51,7 +50,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
2 changes: 0 additions & 2 deletions test/inspect/pass_yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent : <NONE>
Instance Location :

(POINTER) URI: https://example.com#/$defs
Type : Static
Expand All @@ -51,7 +50,6 @@ cat << 'EOF' > "$TMP/expected.txt"
Dialect : https://json-schema.org/draft/2020-12/schema
Base Dialect : https://json-schema.org/draft/2020-12/schema
Parent :
Instance Location :

(POINTER) URI: https://example.com#/$defs/string/type
Type : Static
Expand Down
29 changes: 25 additions & 4 deletions vendor/core/src/core/json/include/sourcemeta/core/json_hash.h
View file
Open in desktop

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
View file
Open in desktop

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

87 changes: 2 additions & 85 deletions vendor/core/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h
View file
Open in desktop

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

Loading