Skip to content

Commit 4604073

Browse files
jviottijviotti
authored
Simplify local resolution of /self/v1 (#619)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent 1a1e8c9 commit 4604073

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1041
-672
lines changed

‎DEPENDENCIES‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
22
uwebsockets https://github.com/uNetworking/uWebSockets v20.74.0
3-
core https://github.com/sourcemeta/core d5ba17dbc53efd419a3ac62808346e5b7aa2920f
4-
blaze https://github.com/sourcemeta/blaze da60a8d67a331be545be8d83e72cf324ccd97efd
3+
core https://github.com/sourcemeta/core 45dd685ea143672fa7384e210f64f8b6de13487e
4+
blaze https://github.com/sourcemeta/blaze 644a3582f3015a92cccdb5ca582c9b2c97e93878
55
jsonbinpack https://github.com/sourcemeta/jsonbinpack 0c2340990bf31c630155991a93306990d9d94fd4
66
hydra https://github.com/sourcemeta/hydra c86d2165a2f27f838837af1a5af24b1055a35317
77
codegen https://github.com/sourcemeta/codegen 10466c0216d36cdc65cf8e951f1dcf85cc580502
8-
jsonschema https://github.com/sourcemeta/jsonschema 455885c4ce74e16779255b5809352b6dcfe6facd
8+
jsonschema https://github.com/sourcemeta/jsonschema c15220ffa8c168ab17ba2c02e11d95504e463ddb
99
bootstrap https://github.com/twbs/bootstrap v5.3.3
1010
bootstrap-icons https://github.com/twbs/icons v1.11.3
1111
collections/sourcemeta/std/v0 https://github.com/sourcemeta/std v0.4.0

‎collections/self/v1/jsonschema.in.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"x-sourcemeta-one:provenance": "@@COLLECTION_NAMESPACE@",
3+
"path": "./schemas",
4+
"resolve": {
5+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ieee/posix/2017/path": "/sourcemeta/std/v0/ieee/posix/2017/path",
6+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/email/address": "/sourcemeta/std/v0/ietf/email/address",
7+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer": "/sourcemeta/std/v0/ietf/jsonpointer/pointer",
8+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/problem-details/problem": "/sourcemeta/std/v0/ietf/problem-details/problem",
9+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri": "/sourcemeta/std/v0/ietf/uri/uri",
10+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-reference": "/sourcemeta/std/v0/ietf/uri/uri-reference",
11+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-relative": "/sourcemeta/std/v0/ietf/uri/uri-relative",
12+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url": "/sourcemeta/std/v0/ietf/uri/url",
13+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/it/2015/byte": "/sourcemeta/std/v0/iso/it/2015/byte",
14+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/units/2022/percentage": "/sourcemeta/std/v0/iso/units/2022/percentage"
15+
}
16+
}

‎collections/self/v1/jsonschema.json‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
{
2-
"x-sourcemeta-one:provenance": "@@COLLECTION_NAMESPACE@",
32
"path": "./schemas",
43
"resolve": {
5-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ieee/posix/2017/path.json": "../../../../sourcemeta/std/v0/ieee/posix/2017/path.json",
6-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-reference.json": "../../../../sourcemeta/std/v0/ietf/uri/uri-reference.json",
7-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri.json": "../../../../sourcemeta/std/v0/ietf/uri/uri.json",
8-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json": "../../../../sourcemeta/std/v0/ietf/uri/url.json",
9-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/email/address.json": "../../../../sourcemeta/std/v0/ietf/email/address.json",
10-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json": "../../../../sourcemeta/std/v0/ietf/uri/uri-relative.json",
11-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json": "../../../../sourcemeta/std/v0/iso/units/2022/percentage.json",
12-
"../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/problem-details/problem.json": "../../../../sourcemeta/std/v0/ietf/problem-details/problem.json",
13-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json": "../../../../../sourcemeta/std/v0/ietf/uri/uri-relative.json",
14-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri.json": "../../../../../sourcemeta/std/v0/ietf/uri/uri.json",
15-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json": "../../../../../sourcemeta/std/v0/ietf/uri/url.json",
16-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/email/address.json": "../../../../../sourcemeta/std/v0/ietf/email/address.json",
17-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/it/2015/byte.json": "../../../../../sourcemeta/std/v0/iso/it/2015/byte.json",
18-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json": "../../../../../sourcemeta/std/v0/iso/units/2022/percentage.json",
19-
"../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json": "../../../../../sourcemeta/std/v0/ietf/jsonpointer/pointer.json",
20-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json": "../../../../../../sourcemeta/std/v0/ietf/jsonpointer/pointer.json",
21-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json": "../../../../../../sourcemeta/std/v0/ietf/uri/uri-relative.json",
22-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri.json": "../../../../../../sourcemeta/std/v0/ietf/uri/uri.json",
23-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json": "../../../../../../sourcemeta/std/v0/ietf/uri/url.json",
24-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/it/2015/byte.json": "../../../../../../sourcemeta/std/v0/iso/it/2015/byte.json",
25-
"../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json": "../../../../../../sourcemeta/std/v0/iso/units/2022/percentage.json"
4+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ieee/posix/2017/path": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ieee/posix/2017/path.json",
5+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/email/address": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/email/address.json",
6+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json",
7+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/problem-details/problem": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/problem-details/problem.json",
8+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri.json",
9+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-reference": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-reference.json",
10+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-relative": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json",
11+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json",
12+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/it/2015/byte": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/it/2015/byte.json",
13+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/units/2022/percentage": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json",
14+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/urn": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/urn.json",
15+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ieee/posix/2017/path-absolute": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ieee/posix/2017/path-absolute.json",
16+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ieee/posix/2017/path-relative": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ieee/posix/2017/path-relative.json",
17+
"https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/http/status": "../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/http/status.json"
2618
}
2719
}

‎collections/self/v1/one.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ install(FILES "${CMAKE_CURRENT_LIST_DIR}/one.json"
77
DESTINATION "${CMAKE_INSTALL_DATADIR}/sourcemeta/one/collections/${COLLECTION_NAMESPACE}"
88
COMPONENT sourcemeta_one)
99

10-
configure_file("${CMAKE_CURRENT_LIST_DIR}/jsonschema.json"
10+
configure_file("${CMAKE_CURRENT_LIST_DIR}/jsonschema.in.json"
1111
"${CMAKE_CURRENT_BINARY_DIR}/${COLLECTION_NAMESPACE}.json" @ONLY)
1212
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${COLLECTION_NAMESPACE}.json"
1313
DESTINATION "${CMAKE_INSTALL_DATADIR}/sourcemeta/one/collections/${COLLECTION_NAMESPACE}"

‎collections/self/v1/schemas/api/error.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"detail": "The requested schema was not found"
1010
}
1111
],
12-
"$ref": "../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/problem-details/problem.json",
12+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/problem-details/problem",
1313
"required": [ "title", "status", "detail" ],
1414
"properties": {
1515
"title": {

‎collections/self/v1/schemas/api/list/response.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"type": "string"
3636
},
3737
"path": {
38-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json"
38+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-relative"
3939
}
4040
},
4141
"additionalProperties": false
4242
}
4343
},
4444
"email": {
45-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/email/address.json"
45+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/email/address"
4646
},
4747
"entries": {
4848
"type": "array",
@@ -62,22 +62,22 @@
6262
"const": "directory"
6363
},
6464
"email": {
65-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/email/address.json"
65+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/email/address"
6666
},
6767
"github": {
6868
"type": "string"
6969
},
7070
"health": {
71-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json"
71+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/units/2022/percentage"
7272
},
7373
"name": {
7474
"type": "string"
7575
},
7676
"path": {
77-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json"
77+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-relative"
7878
},
7979
"website": {
80-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
80+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
8181
}
8282
},
8383
"additionalProperties": false
@@ -102,16 +102,16 @@
102102
"type": "string"
103103
},
104104
"health": {
105-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json"
105+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/units/2022/percentage"
106106
},
107107
"path": {
108-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri-relative.json"
108+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri-relative"
109109
},
110110
"url": {
111-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
111+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
112112
},
113113
"website": {
114-
"$ref": "../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
114+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
115115
}
116116
},
117117
"additionalProperties": false

‎collections/self/v1/schemas/api/schemas/dependencies/response.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"required": [ "from", "to", "at" ],
1818
"properties": {
1919
"at": {
20-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
20+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
2121
},
2222
"from": {
23-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
23+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
2424
},
2525
"to": {
26-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
26+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
2727
}
2828
},
2929
"additionalProperties": false

‎collections/self/v1/schemas/api/schemas/evaluate/response.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
],
3737
"properties": {
3838
"absoluteKeywordLocation": {
39-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
39+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
4040
},
4141
"annotation": {
4242
"type": "array",
4343
"minItems": 1
4444
},
4545
"instanceLocation": {
46-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
46+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
4747
},
4848
"keywordLocation": {
49-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
49+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
5050
}
5151
},
5252
"additionalProperties": false
@@ -75,16 +75,16 @@
7575
],
7676
"properties": {
7777
"absoluteKeywordLocation": {
78-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
78+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
7979
},
8080
"error": {
8181
"type": "string"
8282
},
8383
"instanceLocation": {
84-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
84+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
8585
},
8686
"keywordLocation": {
87-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
87+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
8888
}
8989
},
9090
"additionalProperties": false

‎collections/self/v1/schemas/api/schemas/health/response.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
"type": "array",
4242
"minItems": 1,
4343
"items": {
44-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
44+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
4545
}
4646
}
4747
},
4848
"additionalProperties": false
4949
}
5050
},
5151
"score": {
52-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/iso/units/2022/percentage.json"
52+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/iso/units/2022/percentage"
5353
}
5454
},
5555
"additionalProperties": false

‎collections/self/v1/schemas/api/schemas/locations/response.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,35 @@
4545
"enum": [ "resource", "anchor", "pointer", "subschema" ]
4646
},
4747
"base": {
48-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
48+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
4949
},
5050
"baseDialect": {
51-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/uri.json"
51+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/uri"
5252
},
5353
"dialect": {
54-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
54+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
5555
},
5656
"parent": {
5757
"anyOf": [
5858
{
5959
"type": "null"
6060
},
6161
{
62-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
62+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
6363
}
6464
]
6565
},
6666
"pointer": {
67-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
67+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
6868
},
6969
"position": {
7070
"$ref": "../position.json"
7171
},
7272
"relativePointer": {
73-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/jsonpointer/pointer.json"
73+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/jsonpointer/pointer"
7474
},
7575
"root": {
76-
"$ref": "../../../../../../../vendor/collections/sourcemeta/std/v0/schemas/2020-12/ietf/uri/url.json"
76+
"$ref": "https://schemas.sourcemeta.com/sourcemeta/std/v0/ietf/uri/url"
7777
},
7878
"propertyName": {
7979
"type": "boolean"

0 commit comments

Comments
 (0)