diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-10-14 21:26:53 -0400 |
---|---|---|
committer | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-10-14 21:31:03 -0400 |
commit | 858fe7ae11850eaafb3e024289faf0c78e083abf (patch) | |
tree | 701390a05b3163199c06d7cf2482d13c6f61b1a2 /ext/data/schemas | |
parent | f6c346136297c10389897b183db4f05c07d204fa (diff) |
String frequency support (#1989)
* Restore support for string frequency values
* Add support for {value, displayValue} frequencies
* Update test data
* Improve number parsing of string frequencies
* Improve reading detection
* Expose a displayValue property for frequency information
* Update docs
* Expose displayValue to Anki note data
* Fix translator
* Update display generation
* Update test data
* Update counts
Diffstat (limited to 'ext/data/schemas')
-rw-r--r-- | ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json | 26 | ||||
-rw-r--r-- | ext/data/schemas/dictionary-term-meta-bank-v3-schema.json | 28 |
2 files changed, 51 insertions, 3 deletions
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 49f7c813..0864c9aa 100644 --- a/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json @@ -1,5 +1,29 @@ { "$schema": "http://json-schema.org/draft-07/schema#", + "definitions": { + "frequency": { + "oneOf": [ + { + "type": ["string", "number"] + }, + { + "type": "object", + "additionalProperties": false, + "required": [ + "value" + ], + "properties": { + "value": { + "type": "number" + }, + "displayValue": { + "type": "string" + } + } + } + ] + } + }, "type": "array", "description": "Custom metadata for kanji characters.", "additionalItems": { @@ -17,7 +41,7 @@ "description": "Type of data. \"freq\" corresponds to frequency information." }, { - "type": ["number"], + "$ref": "#/definitions/frequency", "description": "Data for the character." } ] 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 206e7152..96f2e54b 100644 --- a/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json +++ b/ext/data/schemas/dictionary-term-meta-bank-v3-schema.json @@ -1,5 +1,29 @@ { "$schema": "http://json-schema.org/draft-07/schema#", + "definitions": { + "frequency": { + "oneOf": [ + { + "type": ["string", "number"] + }, + { + "type": "object", + "additionalProperties": false, + "required": [ + "value" + ], + "properties": { + "value": { + "type": "number" + }, + "displayValue": { + "type": "string" + } + } + } + ] + } + }, "type": "array", "description": "Custom metadata for terms.", "additionalItems": { @@ -28,7 +52,7 @@ { "oneOf": [ { - "type": ["number"], + "$ref": "#/definitions/frequency", "description": "Frequency information for the term." }, { @@ -44,7 +68,7 @@ "description": "Reading for the term." }, "frequency": { - "type": ["number"], + "$ref": "#/definitions/frequency", "description": "Frequency information for the term." } } |