Skip to content

Commit 8953f88

Browse files
authored
fix: update JSON schema for Tombi with improved structure and deprecations (SchemaStore#4747)
Co-authored-by: ya7010 <[email protected]>
1 parent 76bc385 commit 8953f88

File tree

1 file changed

+32
-6
lines changed

1 file changed

+32
-6
lines changed

src/schemas/json/tombi.json

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,40 @@
414414
"x-tombi-table-keys-order": "schema"
415415
},
416416
"SchemaCatalog": {
417+
"anyOf": [
418+
{
419+
"$ref": "#/definitions/NewSchemaCatalog"
420+
},
421+
{
422+
"$ref": "#/definitions/SchemaCatalogOld"
423+
}
424+
]
425+
},
426+
"NewSchemaCatalog": {
427+
"type": "object",
428+
"properties": {
429+
"paths": {
430+
"title": "The schema catalog path/url array.",
431+
"description": "The catalog is evaluated after the schemas specified by [[schemas]].",
432+
"type": ["array", "null"],
433+
"items": {
434+
"$ref": "#/definitions/SchemaCatalogPath"
435+
},
436+
"default": ["https://www.schemastore.org/api/json/catalog.json"]
437+
}
438+
},
439+
"additionalProperties": false
440+
},
441+
"SchemaCatalogPath": {
442+
"description": "Generic value that can be either single or multiple",
443+
"type": "string"
444+
},
445+
"SchemaCatalogOld": {
417446
"type": "object",
418447
"properties": {
419448
"path": {
420449
"title": "The schema catalog path or url.",
421-
"description": "The catalog is evaluated after the schemas specified by [[schemas]].\n\n You can specify multiple catalogs by making it an array.\n If you specify an array, the catalogs are searched in order of priority starting from the first catalog.\n If you want to disable the default catalog, specify an empty array.",
450+
"description": "**🚧 Deprecated 🚧**\\\n Please use `schema.catalog.paths` instead.",
422451
"anyOf": [
423452
{
424453
"$ref": "#/definitions/OneOrMany_for_SchemaCatalogPath"
@@ -427,6 +456,7 @@
427456
"type": "null"
428457
}
429458
],
459+
"deprecated": true,
430460
"default": "https://www.schemastore.org/api/json/catalog.json"
431461
}
432462
},
@@ -445,10 +475,6 @@
445475
}
446476
]
447477
},
448-
"SchemaCatalogPath": {
449-
"description": "Generic value that can be either single or multiple",
450-
"type": "string"
451-
},
452478
"Schema": {
453479
"anyOf": [
454480
{
@@ -543,7 +569,7 @@
543569
},
544570
"root-keys": {
545571
"title": "The keys to apply the sub schema.",
546-
"description": "Please use `root` instead.",
572+
"description": "**🚧 Deprecated 🚧**\\\n Please use `schemas[*].root` instead.",
547573
"type": ["string", "null"],
548574
"deprecated": true,
549575
"minLength": 1

0 commit comments

Comments
 (0)