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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
core https://github.com/sourcemeta/core 9d2f9fe6b6e27a2710abdf79fb7b7b420fe8b484
jsonbinpack https://github.com/sourcemeta/jsonbinpack 73414f15457e4412fde218b22b95c45fa4a60a27
blaze https://github.com/sourcemeta/blaze 640d28fc61b714493e339fca1d00c134a7efb828
core https://github.com/sourcemeta/core 39431ca30471bb248effafb841f937962bf8291c
jsonbinpack https://github.com/sourcemeta/jsonbinpack 3caa1477ab49ea662de6754f1eb0cd2af6e9612b
blaze https://github.com/sourcemeta/blaze b10fca7344e3a11048587a7b904e5710fbb448d3
mbedtls https://github.com/Mbed-TLS/mbedtls v3.6.6
curl https://github.com/curl/curl curl-8_20_0
nghttp2 https://github.com/nghttp2/nghttp2 v1.67.1
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::json)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::jsonl)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::gzip)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::jsonpointer)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::jsonschema)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::yaml)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::regex)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::editorschema)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::core::options)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::blaze::foundation)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::blaze::editor)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::blaze::configuration)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsonbinpack::compiler)
target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsonbinpack::runtime)
Expand Down
58 changes: 29 additions & 29 deletions src/command_bundle.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <sourcemeta/core/editorschema.h>
#include <sourcemeta/blaze/editor.h>
#include <sourcemeta/blaze/foundation.h>
#include <sourcemeta/core/io.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/yaml.h>

#include <iostream> // std::cout
Expand Down Expand Up @@ -42,7 +42,7 @@ auto sourcemeta::jsonschema::bundle(const sourcemeta::core::Options &options)
auto parsed_schema{schema_from_stdin ? read_from_stdin()
: read_file(schema_path)};

if (!sourcemeta::core::is_schema(parsed_schema.document)) {
if (!sourcemeta::blaze::is_schema(parsed_schema.document)) {
throw NotSchemaError{schema_display_path};
}

Expand All @@ -52,8 +52,8 @@ auto sourcemeta::jsonschema::bundle(const sourcemeta::core::Options &options)
resolver(options, options.contains("http"), dialect, configuration)};

try {
sourcemeta::core::bundle(
schema, sourcemeta::core::schema_walker, custom_resolver, dialect,
sourcemeta::blaze::bundle(
schema, sourcemeta::blaze::schema_walker, custom_resolver, dialect,
sourcemeta::jsonschema::default_id(schema_resolution_base));

if (options.contains("without-id")) {
Expand All @@ -70,50 +70,50 @@ auto sourcemeta::jsonschema::bundle(const sourcemeta::core::Options &options)
"other schemas\n"
<< "using the --resolve/-r option.\n";

sourcemeta::core::for_editor(schema, sourcemeta::core::schema_walker,
custom_resolver, dialect);
sourcemeta::blaze::for_editor(schema, sourcemeta::blaze::schema_walker,
custom_resolver, dialect);
}

sourcemeta::core::format(schema, sourcemeta::core::schema_walker,
custom_resolver, dialect);
} catch (const sourcemeta::core::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaKeywordError>(
sourcemeta::blaze::format(schema, sourcemeta::blaze::schema_walker,
custom_resolver, dialect);
} catch (const sourcemeta::blaze::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaKeywordError>(
schema_display_path, error);
} catch (const sourcemeta::core::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaFrameError>(
} catch (const sourcemeta::blaze::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaFrameError>(
schema_display_path, error);
} catch (const sourcemeta::core::SchemaAnchorCollisionError &error) {
} catch (const sourcemeta::blaze::SchemaAnchorCollisionError &error) {
const auto position{parsed_schema.positions.get(error.location())};
if (position.has_value()) {
throw PositionError<sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>>(
sourcemeta::blaze::SchemaAnchorCollisionError>>(
std::get<0>(position.value()), std::get<1>(position.value()),
schema_display_path, error);
}

throw sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>(schema_display_path,
error);
} catch (const sourcemeta::core::SchemaReferenceError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaReferenceError>(
sourcemeta::blaze::SchemaAnchorCollisionError>(schema_display_path,
error);
} catch (const sourcemeta::blaze::SchemaReferenceError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaReferenceError>(
schema_display_path, error.identifier(), error.location(),
error.what());
} catch (
const sourcemeta::core::SchemaRelativeMetaschemaResolutionError &error) {
const sourcemeta::blaze::SchemaRelativeMetaschemaResolutionError &error) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaRelativeMetaschemaResolutionError>(
sourcemeta::blaze::SchemaRelativeMetaschemaResolutionError>(
schema_display_path, error);
} catch (const sourcemeta::core::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaResolutionError>(
} catch (const sourcemeta::blaze::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaResolutionError>(
schema_display_path, error);
} catch (const sourcemeta::core::SchemaUnknownBaseDialectError &) {
} catch (const sourcemeta::blaze::SchemaUnknownBaseDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownBaseDialectError>(schema_display_path);
} catch (const sourcemeta::core::SchemaUnknownDialectError &) {
sourcemeta::blaze::SchemaUnknownBaseDialectError>(schema_display_path);
} catch (const sourcemeta::blaze::SchemaUnknownDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownDialectError>(schema_display_path);
} catch (const sourcemeta::core::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaError>(
sourcemeta::blaze::SchemaUnknownDialectError>(schema_display_path);
} catch (const sourcemeta::blaze::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaError>(
schema_display_path, error.what());
}

Expand Down
38 changes: 19 additions & 19 deletions src/command_codegen.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <sourcemeta/blaze/codegen.h>
#include <sourcemeta/blaze/foundation.h>
#include <sourcemeta/core/io.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/uri.h>
#include <sourcemeta/core/yaml.h>

Expand Down Expand Up @@ -51,40 +51,40 @@ auto sourcemeta::jsonschema::codegen(const sourcemeta::core::Options &options)
sourcemeta::blaze::CodegenIRResult result;
try {
result = sourcemeta::blaze::compile(
schema, sourcemeta::core::schema_walker, custom_resolver,
schema, sourcemeta::blaze::schema_walker, custom_resolver,
sourcemeta::blaze::default_compiler, dialect,
sourcemeta::jsonschema::default_id(schema_path));
} catch (const sourcemeta::core::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaKeywordError>(
} catch (const sourcemeta::blaze::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaKeywordError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaFrameError>(
} catch (const sourcemeta::blaze::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaFrameError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaAnchorCollisionError &error) {
} catch (const sourcemeta::blaze::SchemaAnchorCollisionError &error) {
const auto position{parsed_schema.positions.get(error.location())};
if (position.has_value()) {
throw PositionError<sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>>(
sourcemeta::blaze::SchemaAnchorCollisionError>>(
std::get<0>(position.value()), std::get<1>(position.value()),
schema_path, error);
}

throw sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>(schema_path, error);
} catch (const sourcemeta::core::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaResolutionError>(
sourcemeta::blaze::SchemaAnchorCollisionError>(schema_path, error);
} catch (const sourcemeta::blaze::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaResolutionError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaUnknownBaseDialectError &) {
} catch (const sourcemeta::blaze::SchemaUnknownBaseDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownBaseDialectError>(schema_path);
} catch (const sourcemeta::core::SchemaUnknownDialectError &) {
sourcemeta::blaze::SchemaUnknownBaseDialectError>(schema_path);
} catch (const sourcemeta::blaze::SchemaUnknownDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownDialectError>(schema_path);
} catch (const sourcemeta::core::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaError>(
sourcemeta::blaze::SchemaUnknownDialectError>(schema_path);
} catch (const sourcemeta::blaze::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaError>(
schema_path, error.what());
} catch (const sourcemeta::core::SchemaVocabularyError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaVocabularyError>(
} catch (const sourcemeta::blaze::SchemaVocabularyError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaVocabularyError>(
schema_path, error.uri(), error.what());
} catch (const sourcemeta::blaze::CodegenUnsupportedKeywordError &error) {
throw sourcemeta::core::FileError<
Expand Down
58 changes: 29 additions & 29 deletions src/command_compile.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <sourcemeta/blaze/foundation.h>
#include <sourcemeta/core/io.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/regex.h>
#include <sourcemeta/core/yaml.h>

Expand Down Expand Up @@ -35,7 +35,7 @@ auto sourcemeta::jsonschema::compile(const sourcemeta::core::Options &options)

auto parsed_schema{read_file(schema_path)};

if (!sourcemeta::core::is_schema(parsed_schema.document)) {
if (!sourcemeta::blaze::is_schema(parsed_schema.document)) {
throw NotSchemaError{schema_path};
}

Expand All @@ -49,13 +49,13 @@ auto sourcemeta::jsonschema::compile(const sourcemeta::core::Options &options)
sourcemeta::blaze::Template schema_template;
try {
if (options.contains("entrypoint") && !options.at("entrypoint").empty()) {
const sourcemeta::core::JSON bundled{sourcemeta::core::bundle(
schema, sourcemeta::core::schema_walker, custom_resolver, dialect,
const sourcemeta::core::JSON bundled{sourcemeta::blaze::bundle(
schema, sourcemeta::blaze::schema_walker, custom_resolver, dialect,
schema_default_id)};

sourcemeta::core::SchemaFrame frame{
sourcemeta::core::SchemaFrame::Mode::References};
frame.analyse(bundled, sourcemeta::core::schema_walker, custom_resolver,
sourcemeta::blaze::SchemaFrame frame{
sourcemeta::blaze::SchemaFrame::Mode::References};
frame.analyse(bundled, sourcemeta::blaze::schema_walker, custom_resolver,
dialect, schema_default_id);

std::string entrypoint_uri;
Expand All @@ -68,13 +68,13 @@ auto sourcemeta::jsonschema::compile(const sourcemeta::core::Options &options)
}

schema_template = sourcemeta::blaze::compile(
bundled, sourcemeta::core::schema_walker, custom_resolver,
bundled, sourcemeta::blaze::schema_walker, custom_resolver,
sourcemeta::blaze::default_schema_compiler, frame, entrypoint_uri,
fast_mode ? sourcemeta::blaze::Mode::FastValidation
: sourcemeta::blaze::Mode::Exhaustive);
} else {
schema_template = sourcemeta::blaze::compile(
schema, sourcemeta::core::schema_walker, custom_resolver,
schema, sourcemeta::blaze::schema_walker, custom_resolver,
sourcemeta::blaze::default_schema_compiler,
fast_mode ? sourcemeta::blaze::Mode::FastValidation
: sourcemeta::blaze::Mode::Exhaustive,
Expand All @@ -91,42 +91,42 @@ auto sourcemeta::jsonschema::compile(const sourcemeta::core::Options &options)
throw sourcemeta::core::FileError<
sourcemeta::blaze::CompilerReferenceTargetNotSchemaError>(schema_path,
error);
} catch (const sourcemeta::core::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaKeywordError>(
} catch (const sourcemeta::blaze::SchemaKeywordError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaKeywordError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaFrameError>(
} catch (const sourcemeta::blaze::SchemaFrameError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaFrameError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaAnchorCollisionError &error) {
} catch (const sourcemeta::blaze::SchemaAnchorCollisionError &error) {
const auto position{parsed_schema.positions.get(error.location())};
if (position.has_value()) {
throw PositionError<sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>>(
sourcemeta::blaze::SchemaAnchorCollisionError>>(
std::get<0>(position.value()), std::get<1>(position.value()),
schema_path, error);
}

throw sourcemeta::core::FileError<
sourcemeta::core::SchemaAnchorCollisionError>(schema_path, error);
sourcemeta::blaze::SchemaAnchorCollisionError>(schema_path, error);
} catch (
const sourcemeta::core::SchemaRelativeMetaschemaResolutionError &error) {
const sourcemeta::blaze::SchemaRelativeMetaschemaResolutionError &error) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaRelativeMetaschemaResolutionError>(schema_path,
error);
} catch (const sourcemeta::core::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaResolutionError>(
sourcemeta::blaze::SchemaRelativeMetaschemaResolutionError>(schema_path,
error);
} catch (const sourcemeta::blaze::SchemaResolutionError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaResolutionError>(
schema_path, error);
} catch (const sourcemeta::core::SchemaUnknownBaseDialectError &) {
} catch (const sourcemeta::blaze::SchemaUnknownBaseDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownBaseDialectError>(schema_path);
} catch (const sourcemeta::core::SchemaUnknownDialectError &) {
sourcemeta::blaze::SchemaUnknownBaseDialectError>(schema_path);
} catch (const sourcemeta::blaze::SchemaUnknownDialectError &) {
throw sourcemeta::core::FileError<
sourcemeta::core::SchemaUnknownDialectError>(schema_path);
} catch (const sourcemeta::core::SchemaVocabularyError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaVocabularyError>(
sourcemeta::blaze::SchemaUnknownDialectError>(schema_path);
} catch (const sourcemeta::blaze::SchemaVocabularyError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaVocabularyError>(
schema_path, error.uri(), error.what());
} catch (const sourcemeta::core::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::core::SchemaError>(
} catch (const sourcemeta::blaze::SchemaError &error) {
throw sourcemeta::core::FileError<sourcemeta::blaze::SchemaError>(
schema_path, error.what());
}

Expand Down
4 changes: 2 additions & 2 deletions src/command_decode.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <sourcemeta/blaze/foundation.h>
#include <sourcemeta/core/io.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonschema.h>

#include <sourcemeta/jsonbinpack/compiler.h>
#include <sourcemeta/jsonbinpack/runtime.h>
Expand Down Expand Up @@ -51,7 +51,7 @@ auto sourcemeta::jsonschema::decode(const sourcemeta::core::Options &options)
const auto &custom_resolver{
resolver(options, options.contains("http"), dialect, configuration)};

sourcemeta::jsonbinpack::compile(schema, sourcemeta::core::schema_walker,
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
custom_resolver);
const auto encoding{sourcemeta::jsonbinpack::load(schema)};

Expand Down
4 changes: 2 additions & 2 deletions src/command_encode.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <sourcemeta/blaze/foundation.h>
#include <sourcemeta/core/io.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonl.h>
#include <sourcemeta/core/jsonschema.h>
#include <sourcemeta/core/yaml.h>

#include <sourcemeta/jsonbinpack/compiler.h>
Expand Down Expand Up @@ -41,7 +41,7 @@ auto sourcemeta::jsonschema::encode(const sourcemeta::core::Options &options)
const auto &custom_resolver{
resolver(options, options.contains("http"), dialect, configuration)};

sourcemeta::jsonbinpack::compile(schema, sourcemeta::core::schema_walker,
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
custom_resolver);
const auto encoding{sourcemeta::jsonbinpack::load(schema)};

Expand Down
Loading
Loading