From 84c9231a5e9733a6300d2edf1718b520467d7dc5 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 16 May 2022 19:56:02 -0400 Subject: [PATCH] Update some JSON schemas to be more compliant to the spec (#2136) --- ext/data/schemas/dictionary-kanji-bank-v1-schema.json | 2 +- ext/data/schemas/dictionary-kanji-bank-v3-schema.json | 3 ++- ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json | 3 ++- ext/data/schemas/dictionary-tag-bank-v3-schema.json | 3 ++- ext/data/schemas/dictionary-term-bank-v1-schema.json | 2 +- ext/data/schemas/dictionary-term-bank-v3-schema.json | 3 ++- ext/data/schemas/dictionary-term-meta-bank-v3-schema.json | 5 +++-- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ext/data/schemas/dictionary-kanji-bank-v1-schema.json b/ext/data/schemas/dictionary-kanji-bank-v1-schema.json index 6dad5a7a..5aca2d6a 100644 --- a/ext/data/schemas/dictionary-kanji-bank-v1-schema.json +++ b/ext/data/schemas/dictionary-kanji-bank-v1-schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "description": "Data file containing kanji information.", - "additionalItems": { + "items": { "type": "array", "description": "Information about a single kanji character.", "minItems": 4, diff --git a/ext/data/schemas/dictionary-kanji-bank-v3-schema.json b/ext/data/schemas/dictionary-kanji-bank-v3-schema.json index a5b82039..ee508294 100644 --- a/ext/data/schemas/dictionary-kanji-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-kanji-bank-v3-schema.json @@ -2,10 +2,11 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "description": "Data file containing kanji information.", - "additionalItems": { + "items": { "type": "array", "description": "Information about a single kanji character.", "minItems": 6, + "additionalItems": false, "items": [ { "type": "string", diff --git a/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json b/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json index 0864c9aa..98c023ff 100644 --- a/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json @@ -26,10 +26,11 @@ }, "type": "array", "description": "Custom metadata for kanji characters.", - "additionalItems": { + "items": { "type": "array", "description": "Metadata about a single kanji character.", "minItems": 3, + "additionalItems": false, "items": [ { "type": "string", diff --git a/ext/data/schemas/dictionary-tag-bank-v3-schema.json b/ext/data/schemas/dictionary-tag-bank-v3-schema.json index ee5ca64d..f7721119 100644 --- a/ext/data/schemas/dictionary-tag-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-tag-bank-v3-schema.json @@ -2,10 +2,11 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "description": "Data file containing tag information for terms and kanji.", - "additionalItems": { + "items": { "type": "array", "description": "Information about a single tag.", "minItems": 5, + "additionalItems": false, "items": [ { "type": "string", diff --git a/ext/data/schemas/dictionary-term-bank-v1-schema.json b/ext/data/schemas/dictionary-term-bank-v1-schema.json index 5fd8e2ba..9366e9ff 100644 --- a/ext/data/schemas/dictionary-term-bank-v1-schema.json +++ b/ext/data/schemas/dictionary-term-bank-v1-schema.json @@ -2,7 +2,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "array", "description": "Data file containing term information.", - "additionalItems": { + "items": { "type": "array", "description": "Information about a single term.", "minItems": 5, diff --git a/ext/data/schemas/dictionary-term-bank-v3-schema.json b/ext/data/schemas/dictionary-term-bank-v3-schema.json index 12c2e4f3..a7c861d5 100644 --- a/ext/data/schemas/dictionary-term-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-term-bank-v3-schema.json @@ -302,10 +302,11 @@ }, "type": "array", "description": "Data file containing term information.", - "additionalItems": { + "items": { "type": "array", "description": "Information about a single term.", "minItems": 8, + "additionalItems": false, "items": [ { "type": "string", diff --git a/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json b/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json index 96f2e54b..a8e06d0d 100644 --- a/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json @@ -26,10 +26,11 @@ }, "type": "array", "description": "Custom metadata for terms.", - "additionalItems": { + "items": { "type": "array", "description": "Metadata about a single term.", "minItems": 3, + "additionalItems": false, "items": [ { "type": "string", @@ -97,7 +98,7 @@ "pitches": { "type": "array", "description": "List of different pitch accent information for the term and reading combination.", - "additionalItems": { + "items": { "type": "object", "required": [ "position"