Skip to content

feat: add if/then/else and dependentRequired keywords (JSON Schema 2020-12)#1124

Closed
reuvenharrison wants to merge 14 commits intogetkin:masterfrom
oasdiff:feat/if-then-else-dependent-required
Closed

feat: add if/then/else and dependentRequired keywords (JSON Schema 2020-12)#1124
reuvenharrison wants to merge 14 commits intogetkin:masterfrom
oasdiff:feat/if-then-else-dependent-required

Conversation

@reuvenharrison
Copy link
Contributor

Summary

  • Add if, then, else (*SchemaRef) and dependentRequired (map[string][]string) fields to the Schema struct for JSON Schema 2020-12 / OpenAPI 3.1 support
  • Wire up all plumbing: JSON/YAML marshal/unmarshal, IsEmpty(), validate() sub-schema checks, loader $ref resolution, and transformOpenAPIToJSONSchema recursion
  • Conditional validation (if/then/else) and conditional property requirements (dependentRequired) work via the EnableJSONSchema2020() validator

Test plan

  • 13 new unit tests covering if/then/else validation, dependentRequired, marshal round-trip, extensions leak, and unresolved ref detection
  • Loader test with YAML fixture verifying $ref resolution inside if/then/else
  • Full test suite passes (go test ./...)

🤖 Generated with Claude Code

Chance Kirsch and others added 14 commits October 2, 2025 08:46
The implementation provides complete OpenAPI 3.1 specification compliance while maintaining 100% backward compatibility with OpenAPI 3.0.

## What Was Implemented

### 1. Schema Object Extensions (openapi3/schema.go)

Added full JSON Schema 2020-12 support with new fields:

- **`Const`** - Constant value validation
- **`Examples`** - Array of examples (replaces singular `example`)
- **`PrefixItems`** - Tuple validation for arrays
- **`Contains`, `MinContains`, `MaxContains`** - Array containment validation
- **`PatternProperties`** - Pattern-based property matching
- **`DependentSchemas`** - Conditional schema dependencies
- **`PropertyNames`** - Property name validation
- **`UnevaluatedItems`, `UnevaluatedProperties`** - Unevaluated keyword support
- **Type arrays** - Support for `["string", "null"]` notation

### 2. Document-Level Features (openapi3/openapi3.go)

- **`Webhooks`** - New field for defining webhook callbacks (OpenAPI 3.1)
- **`JSONSchemaDialect`** - Specifies default JSON Schema dialect
- **Version detection methods**:
  - `IsOpenAPI3_0()` - Returns true for 3.0.x documents
  - `IsOpenAPI3_1()` - Returns true for 3.1.x documents
  - `Version()` - Returns major.minor version string

### 3. License Object (openapi3/license.go)

- **`Identifier`** - SPDX license expression (alternative to URL)

### 4. Info Object (openapi3/info.go)

- **`Summary`** - Short summary of the API (OpenAPI 3.1)

### 5. Types Helper Methods (openapi3/schema.go)

New methods for working with type arrays:

- `IncludesNull()` - Checks if null type is included
- `IsMultiple()` - Detects type arrays (OpenAPI 3.1 feature)
- `IsSingle()` - Checks for single type
- `IsEmpty()` - Checks for unspecified types

### 6. JSON Schema 2020-12 Validator (openapi3/schema_jsonschema_validator.go)

A new opt-in validator using [santhosh-tekuri/jsonschema/v6](https://github.com/santhosh-tekuri/jsonschema):

- Full JSON Schema Draft 2020-12 compliance
- Automatic OpenAPI → JSON Schema transformation
- Converts OpenAPI 3.0 `nullable` to type arrays
- Handles `exclusiveMinimum`/`exclusiveMaximum` conversion
- Comprehensive error formatting
- Fallback to built-in validator on compilation errors
…d formatting and correcting the version logic
The ResolveRefsIn function was not resolving $ref references inside
webhooks, causing Schema.Value to be nil when a webhook operation
referenced a component schema.

This adds webhook ref resolution after the paths loop, using the same
resolvePathItemRef function since webhooks contain PathItem objects.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
In OpenAPI 3.0 (JSON Schema draft-04), exclusiveMinimum/exclusiveMaximum
are booleans that modify minimum/maximum values.

In OpenAPI 3.1 (JSON Schema 2020-12), they are numbers representing
the actual exclusive bounds.

This change introduces ExclusiveBound type that can hold either:
- Bool: for OpenAPI 3.0 style boolean modifier
- Value: for OpenAPI 3.1 style numeric bound

The validation and marshaling logic handles both formats correctly.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
…20-12)

Add support for conditional schema validation (if/then/else) and
conditional property requirements (dependentRequired) from JSON Schema
2020-12, commonly used in OpenAPI 3.1 specifications.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@reuvenharrison
Copy link
Contributor Author

Superseded by #1125 which consolidates all OpenAPI 3.1 PRs into a single PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants