Skip to content

Make schemas stricter #242

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
tyrasd merged 3 commits into from
Oct 21, 2025
Merged

Make schemas stricter #242

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e2c907
Make schemas stricter
FloEdelmann Oct 14, 2025
6edb329
Fix schema `required` syntax
FloEdelmann Oct 14, 2025
1c21e64
Make fields → strings → options schema even stricter
FloEdelmann Oct 21, 2025
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
2 changes: 2 additions & 0 deletions schemas/deprecated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"title": "Deprecated tags",
"description": "An ordered list of old tags mapped to new tags.",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "object",
"properties": {
Expand Down
24 changes: 22 additions & 2 deletions schemas/field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"keys": {
"description": "Tag keys whose value is to be displayed",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
Expand Down Expand Up @@ -42,7 +44,8 @@
"type": "string"
}
},
"additionalProperties": false
"additionalProperties": false,
"required": ["rtype"]
}
]
},
Expand Down Expand Up @@ -105,6 +108,8 @@
"options": {
"description": "List of untranslatable string suggestions (combo fields)",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
Expand All @@ -131,15 +136,19 @@
"strings": {
"description": "Strings sent to transifex for translation",
"type": "object",
"minProperties": 1,
"additionalProperties": false,
"properties": {
"options": {
"description": "Translatable options (combo fields).",
"type": "object",
"minProperties": 1,
"additionalProperties": {
"oneOf": [
{ "type": "string" },
{
"type": "object",
"minProperties": 1,
Comment thread
tyrasd marked this conversation as resolved.
Outdated
"properties": {
"title": { "type": "string" },
"description": { "type": "string" }
Expand All @@ -151,11 +160,13 @@
"types": {
"description": "Translatable types (directionalCombo and access only).",
"type": "object",
"minProperties": 1,
"additionalProperties": { "type": "string" }
},
"placeholders": {
"description": "Translatable placeholders (address only).",
"type": "object",
"minProperties": 1,
"additionalProperties": { "type": "string" }
}
}
Expand Down Expand Up @@ -292,23 +303,28 @@
"terms": {
"description": "English synonyms or related search terms",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"locationSet": {
"description": "An object specifying the IDs of regions where this field is or isn't valid. See: https://github.com/ideditor/location-conflation",
"type": "object",
"minProperties": 1,
"properties": {
"include": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"exclude": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
Expand All @@ -332,7 +348,11 @@
},
"icons": {
"description": "For combo fields: Name of icons which represents different values of this field",
"type": "object"
"type": "object",
"minProperties": 1,
"additionalProperties": {
"type": "string"
}
},
"iconsCrossReference": {
"description": "A field can reference icons of another by using that field's identifier contained in brackets, like {field}.",
Expand Down
11 changes: 11 additions & 0 deletions schemas/preset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,33 @@
"addTags": {
"description": "Tags that are added when changing to the preset (default is the same value as 'tags')",
"type": "object",
"minProperties": 1,
"additionalProperties": {
"type": "string"
}
},
"removeTags": {
"description": "Tags that are removed when changing to another preset (default is the same value as 'addTags' which in turn defaults to 'tags')",
"type": "object",
"minProperties": 1,
"additionalProperties": {
"type": "string"
}
},
"fields": {
"description": "Default form fields that are displayed for the preset. A preset can reference the fields of another by using that preset's identifier contained in brackets, like {preset}.",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"moreFields": {
"description": "Additional form fields that can be attached with the 'Add field' dropdown. A preset can reference the \"moreFields\" of another by using that preset's identifier contained in brackets, like {preset}.",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
Expand All @@ -65,13 +71,17 @@
"terms": {
"description": "English search terms or related keywords",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"aliases": {
"description": "Display-ready English synonyms for the `name`",
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
Expand Down Expand Up @@ -125,6 +135,7 @@
}
}
},
"minProperties": 1,
"additionalProperties": false
}
},
Expand Down
10 changes: 4 additions & 6 deletions schemas/preset_category.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
"properties": {
"name": {
"description": "The title of this category in US English",
"type": "string",
"required": true
"type": "string"
},
"icon": {
"description": "Name of preset icon which represents this preset",
"type": "string",
"required": true
"type": "string"
},
"members": {
"description": "The IDs of the presets in this category",
Expand All @@ -22,9 +20,9 @@
"uniqueItems": true,
"items": {
"type": "string"
},
"required": true
}
}
},
"required": ["name", "icon", "members"],
"additionalProperties": false
}
11 changes: 11 additions & 0 deletions schemas/preset_defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,45 @@
"properties": {
"point": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"vertex": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"line": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"area": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
},
"relation": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": {
"type": "string"
}
}
},
"required": ["point", "vertex", "line", "area", "relation"],
"additionalProperties": false
}
⚡