Skip to content

Migrate null type unions to anyOf in strict schemas (#5991) #6362

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

Merged
hyperupcall merged 3 commits into from
Sep 19, 2026
Merged

Migrate null type unions to anyOf in strict schemas (#5991) #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09c13be
Migrate multiple schemas to strict validation (#6038)
shiv07-blip Sep 15, 2026
7a29eb4
Migrate null type unions to anyOf in strict schemas (#5991)
shiv07-blip Sep 15, 2026
bc061a2
Merge upstream/master into strict-validation-5991 (resolves #5991 con…
shiv07-blip Sep 16, 2026
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
21 changes: 0 additions & 21 deletions src/schema-validation.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,12 @@
"minecraft-predicate.json",
"minecraft-recipe.json",
"minecraft-template-pool.json",
"mtad.json",
"mprocs-0.6.4.json",
"nest-cli.json",
"netlify.json",
"nuget-project-3.3.0.json",
"nuget-project.json",
"opensrm.json",
"opspec-io-0.1.7.json",
"package.json",
"paper-plugin.json",
"partial-eslint-plugins.json",
"phrase.json",
"pre-commit-config.json",
"prisma.json",
"prometheus.json",
"putout.json",
"pyrseas-0.8.json",
"pylock.json",
"renovate-39.json",
"renovate-40.json",
"renovate-41.json",
Expand All @@ -146,10 +134,8 @@
"renovate-inherited-schema-42.json",
"renovate-inherited-schema-43.json",
"sigmacv.json",
"size-limit.json",
"stylelintrc.json",
"template.json",
"tmlanguage.json",
"tslint.json",
"typings.json",
"typingsrc.json",
Expand Down Expand Up @@ -183,17 +169,10 @@
"lsdlschema-3.2.json",
"lsdlschema-3.3.json",
"lsdlschema.json",
"nodemon.json",
"openhab-5.1.json",
"partial-pyright.json",
"pep-723.json",
"pyproject.json",
"starlake.json",
"metaschema-draft-07-unofficial-strict.json",
"glazewm.json",
"youtrack-app.json",
"cinnamon-spice-settings.json",
"pnpm-workspace.json",
"podman-desktop-extension.json",
"podman-desktop-extension-1.27.json"
],
Expand Down
92 changes: 73 additions & 19 deletions src/schemas/json/abc-supply-plan-10.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,21 +194,37 @@
"type": "string"
},
"showQuantitiesAs": {
"type": ["string", "null"],
"oneOf": [
{
"type": "string",
"enum": ["Units", "Lots", "Monetary"]
},
{ "type": "null" }
{
"type": "null"
}
],
"title": "Show Quantities As",
"description": "How to display the quantities for this metric"
"description": "How to display the quantities for this metric",
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"comparisonPlanID": {
"type": ["string", "null"],
"title": "Comparison Plan ID",
"description": "The ID of the comparison plan to use for this metric or null if no comparison plan is used"
"description": "The ID of the comparison plan to use for this metric or null if no comparison plan is used",
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
}
},
"required": [
Expand All @@ -226,36 +242,48 @@
{
"if": {
"properties": {
"metricType": { "const": "mfc" }
"metricType": {
"const": "mfc"
}
}
},
"then": {
"properties": {
"showQuantitiesAs": { "type": "null" }
"showQuantitiesAs": {
"type": "null"
}
}
}
},
{
"if": {
"properties": {
"metricType": { "const": "otherDemand" }
"metricType": {
"const": "otherDemand"
}
}
},
"then": {
"properties": {
"showQuantitiesAs": { "type": "null" }
"showQuantitiesAs": {
"type": "null"
}
}
}
},
{
"if": {
"properties": {
"metricType": { "const": "moh" }
"metricType": {
"const": "moh"
}
}
},
"then": {
"properties": {
"showQuantitiesAs": { "type": "null" }
"showQuantitiesAs": {
"type": "null"
}
}
}
},
Expand All @@ -269,14 +297,18 @@
},
"then": {
"properties": {
"showQuantitiesAs": { "type": "null" }
"showQuantitiesAs": {
"type": "null"
}
}
}
},
{
"if": {
"properties": {
"metricType": { "const": "demand" }
"metricType": {
"const": "demand"
}
}
},
"then": {
Expand All @@ -290,7 +322,9 @@
{
"if": {
"properties": {
"metricType": { "const": "actuals" }
"metricType": {
"const": "actuals"
}
}
},
"then": {
Expand All @@ -304,7 +338,9 @@
{
"if": {
"properties": {
"metricType": { "const": "firmRelease" }
"metricType": {
"const": "firmRelease"
}
}
},
"then": {
Expand Down Expand Up @@ -760,12 +796,26 @@
"inventorySystemMaterialNumber": {
"title": "Material Number in the inventory management system",
"description": "For pulling inventory from the inventory management system into Initial Inventory and Firm Orders & Releases",
"type": ["string", "null"]
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"inventorySystemLocationName": {
"title": "Location in the inventory management system",
"description": "For pulling inventory from the inventory management system into Initial Inventory and Firm Orders & Releases and filtering it by location",
"type": ["string", "null"]
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
}
},
"required": [
Expand Down Expand Up @@ -813,7 +863,9 @@
{
"if": {
"properties": {
"timeDependentPlanningParameters": { "const": false }
"timeDependentPlanningParameters": {
"const": false
}
}
},
"then": {
Expand Down Expand Up @@ -849,7 +901,9 @@
{
"if": {
"properties": {
"timeDependentPlanningParameters": { "const": true }
"timeDependentPlanningParameters": {
"const": true
}
}
},
"then": {
Expand Down
Loading
Loading