Skip to content

Commit 11ada32

Browse files
committed
Update meta-schemas for changes in the last draft.
These changes were made for draft 05 but we did not update the meta-schemas for that draft. For the next draft we will definitely need an update, so add these in.
1 parent 4090d4c commit 11ada32

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

Diff for: hyper-schema.json

+6-10
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@
4646
"oneOf": {"$ref": "#/definitions/schemaArray"},
4747
"not": { "$ref": "#" },
4848

49+
"base": {
50+
"description": "URI Template resolved as for the 'href' keyword in the Link Description Object. The resulting URI Reference is resolved against the current URI base and sets the new URI base for URI references within the instance.",
51+
"type": "string"
52+
},
4953
"links": {
5054
"type": "array",
5155
"items": {"$ref": "#/definitions/linkDescription"}
5256
},
53-
"fragmentResolution": {
54-
"type": "string"
55-
},
5657
"media": {
5758
"type": "object",
5859
"properties": {
@@ -65,11 +66,6 @@
6566
"type": "string"
6667
}
6768
}
68-
},
69-
"pathStart": {
70-
"description": "Instances' URIs must start with this value for this schema to apply to them",
71-
"type": "string",
72-
"format": "uri"
7369
}
7470
},
7571
"definitions": {
@@ -80,7 +76,7 @@
8076
"linkDescription": {
8177
"title": "Link Description Object",
8278
"type": "object",
83-
"required": ["href", "rel"],
79+
"required": ["href"],
8480
"properties": {
8581
"href": {
8682
"description": "a URI template, as defined by RFC 6570, with the addition of the $, ( and ) characters for pre-processing",
@@ -103,7 +99,7 @@
10399
"type": "string"
104100
},
105101
"method": {
106-
"description": "method for requesting the target of the link (e.g. for HTTP this might be \"GET\" or \"DELETE\")",
102+
"description": "specifies that the client can construct a templated query (\"get\") or non-idempotent request (\"post\") to a resource.",
107103
"type": "string"
108104
},
109105
"encType": {

Diff for: schema.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
"minimum": 0
1414
},
1515
"positiveIntegerDefault0": {
16-
"allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
16+
"allOf": [
17+
{ "$ref": "#/definitions/positiveInteger" },
18+
{ "default": 0 }
19+
]
1720
},
1821
"simpleTypes": {
1922
"enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
@@ -29,7 +32,7 @@
2932
"properties": {
3033
"id": {
3134
"type": "string",
32-
"format": "uri"
35+
"format": "uriref"
3336
},
3437
"$schema": {
3538
"type": "string",

0 commit comments

Comments
 (0)