Skip to content
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

support for additionalItems #89

Merged
merged 2 commits into from
Dec 13, 2024
Merged

support for additionalItems #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de3cbc4
support for additionalItems
hudson-ai Dec 11, 2024
731ff91
pre draft2020-12 semantics
hudson-ai Dec 11, 2024
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
19 changes: 18 additions & 1 deletion parser/src/json/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const DEFAULT_DRAFT: Draft = Draft::Draft202012;
const TYPES: [&str; 6] = ["null", "boolean", "number", "string", "array", "object"];

// Keywords that are implemented in this module
const IMPLEMENTED: [&str; 22] = [
const IMPLEMENTED: [&str; 23] = [
// Core
"anyOf",
"oneOf",
Expand All @@ -26,6 +26,7 @@ const IMPLEMENTED: [&str; 22] = [
"type",
// Array
"items",
"additionalItems",
"prefixItems",
"minItems",
"maxItems",
Expand Down Expand Up @@ -611,6 +612,7 @@ fn compile_type(ctx: &Context, tp: &str, schema: &HashMap<&str, &Value>) -> Resu
get("maxItems"),
get("prefixItems"),
get("items"),
get("additionalItems"),
),
"object" => compile_object(
ctx,
Expand Down Expand Up @@ -726,7 +728,22 @@ fn compile_array(
max_items: Option<&Value>,
prefix_items: Option<&Value>,
items: Option<&Value>,
additional_items: Option<&Value>,
) -> Result<Schema> {
let (prefix_items, items) = {
// Note that draft detection falls back to Draft202012 if the draft is unknown, so let's relax the draft constraint a bit
// and assume we're in an old draft if additionalItems is present or items is an array
if ctx.draft <= Draft::Draft201909 || additional_items.is_some() || matches!(items, Some(Value::Array(..))) {
match (items, additional_items) {
// Treat array items as prefixItems and additionalItems as items in draft 2019-09 and earlier
(Some(Value::Array(..)), _) => (items, additional_items),
// items is treated as items, and additionalItems is ignored if items is not an array (or is missing)
_ => (None, items),
}
} else {
(prefix_items, items)
}
};
let min_items = match min_items {
None => 0,
Some(val) => val
Expand Down
Loading