Skip to content

Commit 6c1426d

Browse files
openapi3: collapse repeated combinator scope in nested allOf/anyOf/oneOf
SchemaCombinatorElementValidationError wraps each combinator element, so a deeply nested same-combinator schema (common in the AWS specs) rendered "invalid allOf element: " once per nesting level. Collapse a run of same-combinator wrappers in Error() so the scope prints once. The typed chain is unchanged: Unwrap and errors.As still see every level, only the rendered message drops the repeats, and a run of a different combinator (e.g. allOf inside a oneOf) is still shown. Adds a wrapper test for the collapse and chain preservation, and regenerates the affected apis-guru goldens. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 8c54fba commit 6c1426d

32 files changed

Lines changed: 72 additions & 31 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "DescribeScalingPoliciesResponse": invalid allOf element: invalid allOf element: error parsing regexp: invalid character class range: `\p{Print}`
1+
invalid components: schema "DescribeScalingPoliciesResponse": invalid allOf element: error parsing regexp: invalid character class range: `\p{Print}`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "GetReportDefinitionResult": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?=`
1+
invalid components: schema "GetReportDefinitionResult": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?=`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "CreateDevEnvironmentRequest": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "CreateDevEnvironmentRequest": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "DescribeUserPoolDomainResponse": invalid allOf element: invalid allOf element: error parsing regexp: invalid named capture: `(?<!\.)$`
1+
invalid components: schema "DescribeUserPoolDomainResponse": invalid allOf element: error parsing regexp: invalid named capture: `(?<!\.)$`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "CreateEntityRecognizerRequest": invalid allOf element: invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "CreateEntityRecognizerRequest": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "ComprehendMedicalAsyncJobProperties": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "ComprehendMedicalAsyncJobProperties": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "AddStorageSystemRequest": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "AddStorageSystemRequest": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "CreateLifecyclePolicyRequest": invalid allOf element: invalid allOf element: invalid allOf element: invalid allOf element: error parsing regexp: invalid character class range: `\p{all}`
1+
invalid components: schema "CreateLifecyclePolicyRequest": invalid allOf element: error parsing regexp: invalid character class range: `\p{all}`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "AccessPointDescription": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "AccessPointDescription": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
invalid components: schema "CreateKxClusterRequest": invalid allOf element: invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`
1+
invalid components: schema "CreateKxClusterRequest": invalid allOf element: error parsing regexp: invalid or unsupported Perl syntax: `(?!`

0 commit comments

Comments
 (0)