Skip to content
This repository was archived by the owner on Jan 4, 2023. It is now read-only.

update to draft 2019-09 #39

Open
j0ack wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update to draft 2019-09 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e775be8
update to draft 2019-09
j0ack Nov 7, 2022
cf35092
update tests
j0ack Nov 8, 2022
8cd81d4
merge contains with allOf
j0ack Nov 9, 2022
5c4a7fd
bundle
j0ack Nov 9, 2022
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
19,993 changes: 19,314 additions & 679 deletions dist/himarc-register.schema.json
View file
Open in desktop

Large diffs are not rendered by default.

19,994 changes: 19,329 additions & 665 deletions dist/himarc-work.schema.json
View file
Open in desktop

Large diffs are not rendered by default.

1,124 changes: 1,120 additions & 4 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"homepage": "https://github.com/CIEPS/json-schema-himarc#readme",
"devDependencies": {
"@apidevtools/json-schema-ref-parser": "^9.0.9",
"ajv": "^7.2.4",
"ajv": "^8.11.0",
"chai": "^4.3.4",
"mocha": "^9.2.2"
},
Expand Down
21 changes: 19 additions & 2 deletions src/schema/field-010.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,29 @@
}
},
"additionalProperties": false
}
},
"allOf": [
{
"contains": {
"properties": {
"a": {
"type": "string"
}
},
"required": [
"a"
],
"type": "object"
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
"indicator1",
"indicator2",
"subFields"
]
}
}
64 changes: 63 additions & 1 deletion src/schema/field-013.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,69 @@
}
},
"additionalProperties": false
}
},
"allOf": [
{
"contains": {
"type": "object",
"properties": {
"6": {
"type": "string"
}
},
"required": [
"6"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"a": {
"type": "string"
}
},
"required": [
"a"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"b": {
"type": "string"
}
},
"required": [
"b"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"c": {
"type": "string"
}
},
"required": [
"c"
]
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
Expand Down
34 changes: 33 additions & 1 deletion src/schema/field-015.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,39 @@
},
"additionalProperties": false
},
"minItems": 1
"minItems": 1,
"allOf": [
{
"contains": {
"type": "object",
"properties": {
"2": {
"type": "string"
}
},
"required": [
"2"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"6": {
"type": "string"
}
},
"required": [
"6"
]
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
Expand Down
49 changes: 48 additions & 1 deletion src/schema/field-016.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,54 @@
},
"additionalProperties": false
},
"minItems": 1
"minItems": 1,
"allOf": [
{
"contains": {
"type": "object",
"properties": {
"2": {
"type": "string"
}
},
"required": [
"2"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"9": {
"type": "string"
}
},
"required": [
"9"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"a": {
"type": "string"
}
},
"required": [
"a"
]
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
Expand Down
79 changes: 78 additions & 1 deletion src/schema/field-017.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,84 @@
},
"additionalProperties": false
},
"minItems": 1
"minItems": 1,
"allOf": [
{
"contains": {
"type": "object",
"properties": {
"2": {
"type": "string"
}
},
"required": [
"2"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"6": {
"type": "string"
}
},
"required": [
"6"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"b": {
"type": "string"
}
},
"required": [
"b"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"d": {
"type": "string"
}
},
"required": [
"d"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"i": {
"type": "string"
}
},
"required": [
"i"
]
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
Expand Down
34 changes: 33 additions & 1 deletion src/schema/field-018.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,38 @@
},
"additionalProperties": false
},
"allOf": [
{
"contains": {
"properties": {
"6": {
"type": "string"
}
},
"required": [
"6"
],
"type": "object"
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"properties": {
"a": {
"type": "string"
}
},
"required": [
"a"
],
"type": "object"
},
"maxContains": 1,
"minContains": 0
}
],
"minItems": 1
}
},
Expand All @@ -63,4 +95,4 @@
"indicator2",
"subFields"
]
}
}
49 changes: 48 additions & 1 deletion src/schema/field-020.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,54 @@
},
"additionalProperties": false
},
"minItems": 1
"minItems": 1,
"allOf": [
{
"contains": {
"type": "object",
"properties": {
"6": {
"type": "string"
}
},
"required": [
"6"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"a": {
"type": "string"
}
},
"required": [
"a"
]
},
"maxContains": 1,
"minContains": 0
},
{
"contains": {
"type": "object",
"properties": {
"c": {
"type": "string"
}
},
"required": [
"c"
]
},
"maxContains": 1,
"minContains": 0
}
]
}
},
"required": [
Expand Down
Loading