From 459e5bb6f1df55906c47ed0f3bbb66ae115b8173 Mon Sep 17 00:00:00 2001 From: Mike Kistler Date: Sun, 20 Jul 2025 06:36:15 -0700 Subject: [PATCH 1/2] Schema updates for #4339 --- src/schemas/validation/meta.yaml | 2 ++ tests/schema/pass/mega.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/schemas/validation/meta.yaml b/src/schemas/validation/meta.yaml index 52f5ea2ed0..0b4e44887b 100644 --- a/src/schemas/validation/meta.yaml +++ b/src/schemas/validation/meta.yaml @@ -29,6 +29,8 @@ $defs: additionalProperties: type: string type: object + defaultMapping: + type: object propertyName: type: string required: diff --git a/tests/schema/pass/mega.yaml b/tests/schema/pass/mega.yaml index 3e57fb9144..e7b218b0e5 100644 --- a/tests/schema/pass/mega.yaml +++ b/tests/schema/pass/mega.yaml @@ -55,6 +55,9 @@ components: propertyName: type mapping: foo: Foo + defaultMapping: + not: + required: ['type'] x-extension: true anyOf: - $ref: "#/components/schemas/Foo" From 3a788357457dda3762eb76ae135c3bd93d5014c7 Mon Sep 17 00:00:00 2001 From: Mike Kistler Date: Sun, 20 Jul 2025 11:29:12 -0700 Subject: [PATCH 2/2] Apply suggestions from PR review Co-authored-by: Ralf Handl --- src/schemas/validation/meta.yaml | 2 +- tests/schema/pass/mega.yaml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/schemas/validation/meta.yaml b/src/schemas/validation/meta.yaml index 0b4e44887b..0472fd5b27 100644 --- a/src/schemas/validation/meta.yaml +++ b/src/schemas/validation/meta.yaml @@ -30,7 +30,7 @@ $defs: type: string type: object defaultMapping: - type: object + type: string propertyName: type: string required: diff --git a/tests/schema/pass/mega.yaml b/tests/schema/pass/mega.yaml index e7b218b0e5..8304fbe199 100644 --- a/tests/schema/pass/mega.yaml +++ b/tests/schema/pass/mega.yaml @@ -55,9 +55,7 @@ components: propertyName: type mapping: foo: Foo - defaultMapping: - not: - required: ['type'] + defaultMapping: Bar x-extension: true anyOf: - $ref: "#/components/schemas/Foo"