Skip to content

Commit ad6ef85

Browse files
egekorkanegekorkan
committed
Merge remote-tracking branch 'origin/master' into dependency-update-sergio
2 parents 94cd303 + 0215113 commit ad6ef85

File tree

6 files changed

+61
-77
lines changed

6 files changed

+61
-77
lines changed

‎.github/workflows/ci-cd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: lerna bootstrap --no-ci
3838

3939
- name: Test
40-
run: lerna run test --no-bail --stream --ignore=packages/web
40+
run: lerna run --ignore @thing-description-playground/web test --no-bail --stream
4141

4242
- name: TD test
4343
run: node packages/cli/index.js -i examples/td/*/*.jsonld

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"lint:sarif": "npx eslint . --config .eslintrc.json --format @microsoft/eslint-formatter-sarif --output-file eslint-results.sarif",
2424
"lint:fix": "npx eslint . --config .eslintrc.json --fix",
2525
"format": "prettier --write . && npm run format --silent --workspaces --if-present",
26-
"format:quick": "pretty-quick"
26+
"format:quick": "pretty-quick",
27+
"test": "lerna run --ignore @thing-description-playground/web test"
2728
}
2829
}

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@thing-description-playground/core",
33
"author": "Eclipse Thingweb <[email protected]> (https://thingweb.io/)",
44
"license": "EPL-2.0 OR W3C-20150513",
5-
"version": "1.4.0",
5+
"version": "1.4.1",
66
"description": "Provides the validation functionality for the Web of Things - Thing Description Playground.",
77
"homepage": "https://github.com/eclipse-thingweb/playground#readme",
88
"bugs": {

‎packages/core/td-schema-full.json

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Thing Description",
3-
"version": "1.1-05-July-2023",
3+
"version": "1.1-12-March-2025",
44
"description": "JSON Schema for validating TD instances against the TD information model. For a TD to validate this schema it must contain all the default terms defined in Section 5.4",
55
"$schema": "http://json-schema.org/draft-07/schema#",
66
"definitions": {
@@ -83,7 +83,10 @@
8383
"$ref": "#/definitions/anyUri"
8484
},
8585
{
86-
"type": "object"
86+
"type": "object",
87+
"additionalProperties": {
88+
"type": "string"
89+
}
8790
}
8891
],
8992
"not": {
@@ -98,7 +101,7 @@
98101
{
99102
"$comment": "Old context URI, followed by the new one and possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
100103
"type": "array",
101-
"prefixItems": [
104+
"items": [
102105
{
103106
"$ref": "#/definitions/thing-context-td-uri-v1"
104107
},
@@ -107,45 +110,45 @@
107110
}
108111
],
109112
"minItems": 2,
110-
"contains": {
111-
"$ref": "#/definitions/thing-context-td-uri-v1.1"
112-
},
113113
"additionalItems": {
114114
"anyOf": [
115115
{
116116
"$ref": "#/definitions/anyUri"
117117
},
118118
{
119-
"type": "object"
119+
"type": "object",
120+
"additionalProperties": {
121+
"type": "string"
122+
}
120123
}
121124
]
122125
}
123126
},
124127
{
125128
"$comment": "Old context URI, followed by possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
126129
"type": "array",
127-
"prefixItems": [
130+
"items": [
128131
{
129132
"$ref": "#/definitions/thing-context-td-uri-v1"
130133
}
131134
],
132135
"minItems": 1,
133-
"contains": {
134-
"$ref": "#/definitions/thing-context-td-uri-v1"
135-
},
136136
"additionalItems": {
137137
"anyOf": [
138138
{
139139
"$ref": "#/definitions/anyUri"
140140
},
141141
{
142-
"type": "object"
142+
"type": "object",
143+
"additionalProperties": {
144+
"type": "string"
145+
}
143146
}
144147
]
145148
}
146149
},
147150
{
148-
"$comment": "Only the new context URI",
151+
"$comment": "Only the old context URI",
149152
"$ref": "#/definitions/thing-context-td-uri-v1"
150153
}
151154
]

‎packages/core/td-schema.json

+24-47
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Thing Description",
3-
"version": "1.1-05-July-2023",
3+
"version": "1.1-12-March-2025",
44
"description": "JSON Schema for validating TD instances against the TD information model. TD instances can be with or without terms that have default values",
55
"$schema": "http://json-schema.org/draft-07/schema#",
66
"$id": "https://raw.githubusercontent.com/w3c/wot-thing-description/main/validation/td-json-schema-validation.json",
@@ -85,7 +85,10 @@
8585
"$ref": "#/definitions/anyUri"
8686
},
8787
{
88-
"type": "object"
88+
"type": "object",
89+
"additionalProperties": {
90+
"type": "string"
91+
}
8992
}
9093
],
9194
"not": {
@@ -100,7 +103,7 @@
100103
{
101104
"$comment": "Old context URI, followed by the new one and possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
102105
"type": "array",
103-
"prefixItems": [
106+
"items": [
104107
{
105108
"$ref": "#/definitions/thing-context-td-uri-v1"
106109
},
@@ -109,39 +112,39 @@
109112
}
110113
],
111114
"minItems": 2,
112-
"contains": {
113-
"$ref": "#/definitions/thing-context-td-uri-v1.1"
114-
},
115115
"additionalItems": {
116116
"anyOf": [
117117
{
118118
"$ref": "#/definitions/anyUri"
119119
},
120120
{
121-
"type": "object"
121+
"type": "object",
122+
"additionalProperties": {
123+
"type": "string"
124+
}
122125
}
123126
]
124127
}
125128
},
126129
{
127130
"$comment": "Old context URI, followed by possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
128131
"type": "array",
129-
"prefixItems": [
132+
"items": [
130133
{
131134
"$ref": "#/definitions/thing-context-td-uri-v1"
132135
}
133136
],
134137
"minItems": 1,
135-
"contains": {
136-
"$ref": "#/definitions/thing-context-td-uri-v1"
137-
},
138138
"additionalItems": {
139139
"anyOf": [
140140
{
141141
"$ref": "#/definitions/anyUri"
142142
},
143143
{
144-
"type": "object"
144+
"type": "object",
145+
"additionalProperties": {
146+
"type": "string"
147+
}
145148
}
146149
]
147150
}
@@ -363,11 +366,7 @@
363366
"additionalProperties": true
364367
},
365368
"form_element_property": {
366-
"allOf": [
367-
{
368-
"$ref": "#/definitions/form_element_base"
369-
}
370-
],
369+
"allOf": [{ "$ref": "#/definitions/form_element_base" }],
371370
"type": "object",
372371
"properties": {
373372
"op": {
@@ -390,11 +389,7 @@
390389
"additionalProperties": true
391390
},
392391
"form_element_action": {
393-
"allOf": [
394-
{
395-
"$ref": "#/definitions/form_element_base"
396-
}
397-
],
392+
"allOf": [{ "$ref": "#/definitions/form_element_base" }],
398393
"type": "object",
399394
"properties": {
400395
"op": {
@@ -417,11 +412,7 @@
417412
"additionalProperties": true
418413
},
419414
"form_element_event": {
420-
"allOf": [
421-
{
422-
"$ref": "#/definitions/form_element_base"
423-
}
424-
],
415+
"allOf": [{ "$ref": "#/definitions/form_element_base" }],
425416
"type": "object",
426417
"properties": {
427418
"op": {
@@ -444,11 +435,7 @@
444435
"additionalProperties": true
445436
},
446437
"form_element_root": {
447-
"allOf": [
448-
{
449-
"$ref": "#/definitions/form_element_base"
450-
}
451-
],
438+
"allOf": [{ "$ref": "#/definitions/form_element_base" }],
452439
"type": "object",
453440
"properties": {
454441
"op": {
@@ -494,18 +481,10 @@
494481
"form": {
495482
"$comment": "This is NOT for validation purposes but for automatic generation of TS types. For more info, please see: https://github.com/w3c/wot-thing-description/pull/1319#issuecomment-994950057",
496483
"oneOf": [
497-
{
498-
"$ref": "#/definitions/form_element_property"
499-
},
500-
{
501-
"$ref": "#/definitions/form_element_action"
502-
},
503-
{
504-
"$ref": "#/definitions/form_element_event"
505-
},
506-
{
507-
"$ref": "#/definitions/form_element_root"
508-
}
484+
{ "$ref": "#/definitions/form_element_property" },
485+
{ "$ref": "#/definitions/form_element_action" },
486+
{ "$ref": "#/definitions/form_element_event" },
487+
{ "$ref": "#/definitions/form_element_root" }
509488
]
510489
},
511490
"property_element": {
@@ -743,9 +722,7 @@
743722
},
744723
"hreflang": {
745724
"anyOf": [
746-
{
747-
"$ref": "#/definitions/bcp47_string"
748-
},
725+
{ "$ref": "#/definitions/bcp47_string" },
749726
{
750727
"type": "array",
751728
"items": {

‎packages/core/tm-schema.json

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Thing Model",
3-
"version": "1.1-05-July-2023",
3+
"version": "1.1-12-March-2025",
44
"description": "JSON Schema for validating Thing Models. This is automatically generated from the WoT TD Schema.",
55
"$schema": "http://json-schema.org/draft-07/schema#",
66
"$id": "https://raw.githubusercontent.com/w3c/wot-thing-description/main/validation/tm-json-schema-validation.json",
@@ -94,7 +94,10 @@
9494
"$ref": "#/definitions/anyUri"
9595
},
9696
{
97-
"type": "object"
97+
"type": "object",
98+
"additionalProperties": {
99+
"type": "string"
100+
}
98101
}
99102
],
100103
"not": {
@@ -109,7 +112,7 @@
109112
{
110113
"$comment": "Old context URI, followed by the new one and possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
111114
"type": "array",
112-
"prefixItems": [
115+
"items": [
113116
{
114117
"$ref": "#/definitions/thing-context-td-uri-v1"
115118
},
@@ -118,39 +121,39 @@
118121
}
119122
],
120123
"minItems": 2,
121-
"contains": {
122-
"$ref": "#/definitions/thing-context-td-uri-v1.1"
123-
},
124124
"additionalItems": {
125125
"anyOf": [
126126
{
127127
"$ref": "#/definitions/anyUri"
128128
},
129129
{
130-
"type": "object"
130+
"type": "object",
131+
"additionalProperties": {
132+
"type": "string"
133+
}
131134
}
132135
]
133136
}
134137
},
135138
{
136139
"$comment": "Old context URI, followed by possibly other vocabularies. minItems and contains are required since prefixItems does not say all items should be provided",
137140
"type": "array",
138-
"prefixItems": [
141+
"items": [
139142
{
140143
"$ref": "#/definitions/thing-context-td-uri-v1"
141144
}
142145
],
143146
"minItems": 1,
144-
"contains": {
145-
"$ref": "#/definitions/thing-context-td-uri-v1"
146-
},
147147
"additionalItems": {
148148
"anyOf": [
149149
{
150150
"$ref": "#/definitions/anyUri"
151151
},
152152
{
153-
"type": "object"
153+
"type": "object",
154+
"additionalProperties": {
155+
"type": "string"
156+
}
154157
}
155158
]
156159
}
@@ -1751,8 +1754,8 @@
17511754
{
17521755
"not": {
17531756
"type": "string",
1754-
"pattern": "(/)(.*\\1){2}",
1755-
"$comment": "regex tests available at https://regex101.com/r/Ytzd72/1"
1757+
"pattern": "(/)(.*/){2}",
1758+
"$comment": "regex tests available at https://regex101.com/r/r7vB0r/2"
17561759
}
17571760
}
17581761
]

0 commit comments

Comments
 (0)