Skip to content

Commit dc338ab

Browse files
squash - final (?) attempt - move defaults to where they belong, and only include those that insert different behaviour than would exist if they were absent
1 parent 3ea4c02 commit dc338ab

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

meta/applicator.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@
1717
},
1818
"properties": {
1919
"type": "object",
20-
"additionalProperties": { "$dynamicRef": "#meta" },
21-
"default": {}
20+
"additionalProperties": { "$dynamicRef": "#meta" }
2221
},
2322
"patternProperties": {
2423
"type": "object",
2524
"additionalProperties": { "$dynamicRef": "#meta" },
26-
"propertyNames": { "format": "regex" },
27-
"default": {}
25+
"propertyNames": { "format": "regex" }
2826
},
2927
"dependentSchemas": {
3028
"type": "object",
31-
"additionalProperties": { "$dynamicRef": "#meta" },
32-
"default": {}
29+
"additionalProperties": { "$dynamicRef": "#meta" }
3330
},
3431
"propertyNames": {
3532
"$dynamicRef": "#meta"

meta/core.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
},
3232
"$defs": {
3333
"type": "object",
34-
"additionalProperties": { "$dynamicRef": "#meta" },
35-
"default": {}
34+
"additionalProperties": { "$dynamicRef": "#meta" }
3635
}
3736
},
37+
"default": {
38+
"$schema": "https://json-schema.org/draft/2020-12/schema"
39+
},
3840
"$defs": {
3941
"anchorString": {
4042
"type": "string",

meta/meta-data.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,22 @@
1818
},
1919
"default": true,
2020
"deprecated": {
21-
"type": "boolean",
22-
"default": false
21+
"type": "boolean"
2322
},
2423
"readOnly": {
25-
"type": "boolean",
26-
"default": false
24+
"type": "boolean"
2725
},
2826
"writeOnly": {
29-
"type": "boolean",
30-
"default": false
27+
"type": "boolean"
3128
},
3229
"examples": {
3330
"type": "array",
3431
"items": true
3532
}
33+
},
34+
"default": {
35+
"deprecated": false,
36+
"readOnly": false,
37+
"writeOnly": false
3638
}
3739
}

meta/validation.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,11 @@
5050
"maxItems": { "$ref": "#/$defs/nonNegativeInteger" },
5151
"minItems": { "$ref": "#/$defs/nonNegativeIntegerDefault0" },
5252
"uniqueItems": {
53-
"type": "boolean",
54-
"default": false
53+
"type": "boolean"
5554
},
5655
"maxContains": { "$ref": "#/$defs/nonNegativeInteger" },
5756
"minContains": {
58-
"$ref": "#/$defs/nonNegativeInteger",
59-
"default": 1
57+
"$ref": "#/$defs/nonNegativeInteger"
6058
},
6159
"maxProperties": { "$ref": "#/$defs/nonNegativeInteger" },
6260
"minProperties": { "$ref": "#/$defs/nonNegativeIntegerDefault0" },
@@ -65,10 +63,12 @@
6563
"type": "object",
6664
"additionalProperties": {
6765
"$ref": "#/$defs/stringArray"
68-
},
69-
"default": {}
66+
}
7067
}
7168
},
69+
"default": {
70+
"minContains": 1
71+
},
7272
"$defs": {
7373
"nonNegativeInteger": {
7474
"type": "integer",

schema.json

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"$comment": "\"definitions\" has been replaced by \"$defs\".",
3030
"type": "object",
3131
"additionalProperties": { "$dynamicRef": "#meta" },
32-
"default": {},
3332
"deprecated": true
3433
},
3534
"dependencies": {

0 commit comments

Comments
 (0)