From 61469b1ab83dc082b687c80b04caa5df957598a6 Mon Sep 17 00:00:00 2001 From: fatadel Date: Tue, 4 Oct 2022 23:46:59 +0200 Subject: [PATCH 01/28] ignore ds store --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2a21737e6..071dce231 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# os +.DS_STORE + # node node_modules @@ -13,4 +16,4 @@ logs.json log.json # vscode -.vscode \ No newline at end of file +.vscode From 48f525df0f358beda0335ddffc7e2b73cbb449c2 Mon Sep 17 00:00:00 2001 From: fatadel Date: Wed, 5 Oct 2022 00:54:48 +0200 Subject: [PATCH 02/28] refine styling --- packages/web/index.html | 6 ++--- packages/web/style.css | 50 +++++++++-------------------------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/packages/web/index.html b/packages/web/index.html index c494dda54..316f907de 100644 --- a/packages/web/index.html +++ b/packages/web/index.html @@ -85,9 +85,9 @@

Thing Description Playground

-
+
-
+
@@ -95,7 +95,7 @@

Thing Description Playground

-
+
diff --git a/packages/web/style.css b/packages/web/style.css index dcb1d4745..f89572c57 100644 --- a/packages/web/style.css +++ b/packages/web/style.css @@ -11,8 +11,6 @@ body { background-color: white; font-family: 'Gill Sans', 'Gill Sans MT', 'Calibri', 'Trebuchet MS', sans-serif; width: 100%; - min-height: 100vh; - position: relative; } .loading-spinner { @@ -40,26 +38,20 @@ body { padding: 0; } -.wrap { - max-width: 90%; - margin: 0 auto; -} - -.wrapper { - /*min-height: 100%; */ - height: auto !important; - height: 100%; - margin: 0 auto -200px auto; - /* the bottom margin is the negative value of the footer's height */ +.main { + /* Take all height but respect footer */ + height: calc(100vh - 100px); + overflow: hidden; } -.wrapper>.row:first-child { - height: 800px; +#side-panel { + /* Side panel max height is (100vh - top navigation - footer - some margin) */ + max-height: calc(100vh - 160px); + overflow-y: scroll; } - #td-editor, #tm-editor { - height: 800px; + height: 100%; width: auto; } @@ -76,24 +68,7 @@ body { white-space: pre-wrap; max-height: 250px; height: fit-content; -} - -@media(min-height: 1100px) { - .wrapper > .row:first-child { - height: calc(800px + calc(91vh - 1000px)); - } - #td-editor, #tm-editor { - height: calc(800px + calc(91vh - 1000px)); - } - .conrow { - max-height: calc(450px + calc(91vh - 1000px)); - } - #console { - max-height: calc(450px + calc(91vh - 1000px)); - } - .wrapper { - margin: 0 calc(4vw - 60px) -200px 6vw; - } + margin-bottom: 50px; } footer { @@ -107,11 +82,6 @@ footer { height: 50px; } -.main { - padding-top:0px; - padding-bottom: 200px; -} - .panel { padding-left: 1em; } From a756c01c4110bf2a6b4c5260a186d0e50a526aa3 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 16:23:29 +0200 Subject: [PATCH 03/28] change $defs to definitions --- .../sec-body-name-json-pointer copy.json | 4 +- .../sec-body-name-json-pointer.json | 4 +- .../assertions-td/td-action-arrays.json | 8 +- .../td-action-names_at-type.json | 4 +- .../td-action-names_description.json | 4 +- .../td-action-names_descriptions.json | 4 +- .../assertions-td/td-action-names_title.json | 4 +- .../assertions-td/td-action-names_titles.json | 4 +- .../td-action-names_uriVariables.json | 4 +- .../td-context-default-language.json | 6 +- .../td-context-ns-td10-namespace.json | 10 +- ...td-context-ns-thing-map-of-namespaces.json | 6 +- .../td-context-ns-thing-optional.json | 10 +- .../assertions/assertions-td/td-context.json | 10 +- .../assertions-td/td-event-arrays.json | 8 +- .../assertions-td/td-event-names_at-type.json | 4 +- .../td-event-names_description.json | 4 +- .../td-event-names_descriptions.json | 4 +- .../assertions-td/td-event-names_title.json | 4 +- .../assertions-td/td-event-names_titles.json | 4 +- .../td-event-names_uriVariables.json | 4 +- .../assertions-td/td-integer-type.json | 44 +-- .../assertions/assertions-td/td-links.json | 8 +- .../assertions-td/td-number-type.json | 44 +-- .../assertions-td/td-op-for-action.json | 8 +- .../assertions-td/td-op-for-event.json | 8 +- .../assertions-td/td-op-for-property.json | 8 +- .../assertions-td/td-op-for-thing.json | 6 +- .../assertions-td/td-property-arrays.json | 8 +- .../td-property-names_at-type.json | 4 +- .../td-property-names_const.json | 4 +- .../td-property-names_description.json | 4 +- .../td-property-names_descriptions.json | 4 +- .../assertions-td/td-property-names_enum.json | 4 +- .../td-property-names_items.json | 4 +- .../td-property-names_maxItems.json | 4 +- .../td-property-names_maximum.json | 4 +- .../td-property-names_minItems.json | 4 +- .../td-property-names_minimum.json | 4 +- .../td-property-names_oneOf.json | 4 +- .../td-property-names_properties.json | 4 +- .../td-property-names_readOnly.json | 4 +- .../td-property-names_required.json | 4 +- .../td-property-names_title.json | 4 +- .../td-property-names_titles.json | 4 +- .../assertions-td/td-property-names_type.json | 4 +- .../assertions-td/td-property-names_unit.json | 4 +- .../td-property-names_uriVariables.json | 4 +- .../td-property-names_writeOnly.json | 4 +- ...security-bearer-format-extensions_alg.json | 8 +- ...urity-bearer-format-extensions_format.json | 8 +- ...urity-combo-exclusive-oneof-or-alloff.json | 4 +- .../td-security-in-query-over-uri.json | 4 +- .../td-security-oauth2-client-flow.json | 10 +- .../td-security-oauth2-code-flow.json | 12 +- .../td-security-oauth2-device-flow.json | 10 +- .../assertions-td/td-string-type.json | 44 +-- .../td-title-description_descriptions.json | 64 ++-- .../td-title-description_titles.json | 64 ++-- .../td-vocab-additionalResponses--Form.json | 20 +- .../td-vocab-alg--BearerSecurityScheme.json | 8 +- .../td-vocab-allOf--ComboSecurityScheme.json | 4 +- .../assertions-td/td-vocab-anchor--Link.json | 6 +- .../td-vocab-at-type--DataSchema.json | 48 +-- ...-vocab-at-type--InteractionAffordance.json | 14 +- .../td-vocab-at-type--SecurityScheme.json | 6 +- .../td-vocab-at-type--Thing.json | 4 +- ...b-authorization--BearerSecurityScheme.json | 8 +- ...b-authorization--OAuth2SecurityScheme.json | 12 +- ...d-vocab-cancellation--EventAffordance.json | 18 +- .../td-vocab-const--DataSchema.json | 44 +-- .../assertions-td/td-vocab-contentCoding.json | 16 +- ...d-vocab-contentEncoding--StringSchema.json | 36 +- ...-vocab-contentMediaType--StringSchema.json | 36 +- ...ntentType--AdditionalExpectedResponse.json | 20 +- .../td-vocab-contentType-Form.json | 16 +- .../td-vocab-data--EventAffordance.json | 18 +- ...d-vocab-dataResponse--EventAffordance.json | 18 +- .../td-vocab-default--DataSchema.json | 36 +- .../td-vocab-description--DataSchema.json | 52 +-- ...ab-description--InteractionAffordance.json | 50 +-- .../td-vocab-description--SecurityScheme.json | 4 +- .../td-vocab-description--Thing.json | 4 +- .../td-vocab-descriptions--DataSchema.json | 52 +-- ...b-descriptions--InteractionAffordance.json | 50 +-- ...td-vocab-descriptions--SecurityScheme.json | 6 +- .../td-vocab-descriptions--Thing.json | 4 +- .../td-vocab-enum--DataSchema.json | 44 +-- ...vocab-exclusiveMaximum--IntegerSchema.json | 30 +- ...-vocab-exclusiveMaximum--NumberSchema.json | 30 +- ...vocab-exclusiveMinimum--IntegerSchema.json | 30 +- ...-vocab-exclusiveMinimum--NumberSchema.json | 30 +- .../td-vocab-flow--OAuth2SecurityScheme.json | 12 +- ...td-vocab-format--BearerSecurityScheme.json | 8 +- .../td-vocab-format--DataSchema.json | 38 +-- ...td-vocab-forms--InteractionAffordance.json | 16 +- .../assertions-td/td-vocab-forms--Thing.json | 6 +- .../td-vocab-hreflang--Link.json | 8 +- ...td-vocab-idempotent--ActionAffordance.json | 4 +- .../td-vocab-identity--PSKSecurityScheme.json | 6 +- .../td-vocab-in--APIKeySecurityScheme.json | 4 +- .../td-vocab-in--BasicSecurityScheme.json | 4 +- .../td-vocab-in--BearerSecurityScheme.json | 4 +- .../td-vocab-in--DigestSecurityScheme.json | 4 +- .../td-vocab-input--ActionAffordance.json | 18 +- .../td-vocab-items--ArraySchema.json | 52 +-- .../td-vocab-maxItems--ArraySchema.json | 44 +-- .../td-vocab-maxLength--StringSchema.json | 30 +- .../td-vocab-maximum--IntegerSchema.json | 44 +-- .../td-vocab-maximum--NumberSchema.json | 44 +-- .../td-vocab-minItems--ArraySchema.json | 44 +-- .../td-vocab-minLength--StringSchema.json | 30 +- .../td-vocab-minimum--IntegerSchema.json | 44 +-- .../td-vocab-minimum--NumberSchema.json | 44 +-- .../td-vocab-multipleOf--IntegerSchema.json | 30 +- .../td-vocab-multipleOf--NumberSchema.json | 30 +- .../td-vocab-name--APIKeySecurityScheme.json | 6 +- .../td-vocab-name--BasicSecurityScheme.json | 6 +- .../td-vocab-name--BearerSecurityScheme.json | 8 +- .../td-vocab-name--DigestSecurityScheme.json | 6 +- ...-vocab-observable--PropertyAffordance.json | 4 +- .../td-vocab-oneOf--ComboSecurityScheme.json | 4 +- .../td-vocab-oneOf--DataSchema.json | 48 +-- .../td-vocab-op--Form_cancelaction.json | 16 +- .../td-vocab-op--Form_invokeaction.json | 16 +- ...d-vocab-op--Form_observeallproperties.json | 6 +- .../td-vocab-op--Form_observeproperty.json | 16 +- .../td-vocab-op--Form_queryaction.json | 16 +- .../td-vocab-op--Form_queryallactions.json | 6 +- .../td-vocab-op--Form_readallproperties.json | 6 +- ...vocab-op--Form_readmultipleproperties.json | 6 +- .../td-vocab-op--Form_readproperty.json | 6 +- .../td-vocab-op--Form_subscribeallevents.json | 6 +- .../td-vocab-op--Form_subscribeevent.json | 16 +- ...vocab-op--Form_unobserveallproperties.json | 6 +- .../td-vocab-op--Form_unobserveproperty.json | 16 +- ...d-vocab-op--Form_unsubscribeallevents.json | 6 +- .../td-vocab-op--Form_unsubscribeevent.json | 16 +- .../td-vocab-op--Form_writeallproperties.json | 6 +- ...ocab-op--Form_writemultipleproperties.json | 6 +- .../td-vocab-op--Form_writeproperty.json | 6 +- .../td-vocab-output--ActionAffordance.json | 16 +- .../td-vocab-pattern--StringSchema.json | 36 +- .../td-vocab-profile--Thing.json | 6 +- .../td-vocab-properties--ObjectSchema.json | 50 +-- .../td-vocab-proxy--SecurityScheme.json | 6 +- .../td-vocab-qop--DigestSecurityScheme.json | 6 +- .../td-vocab-readOnly--DataSchema.json | 44 +-- ...d-vocab-refresh--OAuth2SecurityScheme.json | 12 +- .../assertions-td/td-vocab-rel--Link.json | 4 +- .../td-vocab-required--ObjectSchema.json | 44 +-- .../td-vocab-response--Form.json | 16 +- .../td-vocab-safe--ActionAffordance.json | 4 +- ...ab-schema--AdditionalExpectedResponse.json | 20 +- ...d-vocab-scheme--SecurityScheme_apikey.json | 4 +- .../td-vocab-scheme--SecurityScheme_auto.json | 4 +- ...td-vocab-scheme--SecurityScheme_basic.json | 4 +- ...d-vocab-scheme--SecurityScheme_bearer.json | 4 +- ...d-vocab-scheme--SecurityScheme_digest.json | 4 +- ...td-vocab-scheme--SecurityScheme_nosec.json | 4 +- ...d-vocab-scheme--SecurityScheme_oauth2.json | 4 +- .../td-vocab-scheme--SecurityScheme_psk.json | 4 +- .../assertions-td/td-vocab-scopes--Form.json | 16 +- ...td-vocab-scopes--OAuth2SecurityScheme.json | 12 +- .../td-vocab-security--Form.json | 16 +- .../assertions-td/td-vocab-sizes--Link.json | 4 +- .../td-vocab-subprotocol--Form.json | 16 +- ...d-vocab-subscription--EventAffordance.json | 18 +- ...b-success--AdditionalExpectedResponse.json | 20 +- ...d-vocab-synchronous--ActionAffordance.json | 16 +- .../td-vocab-title--DataSchema.json | 48 +-- ...td-vocab-title--InteractionAffordance.json | 14 +- .../td-vocab-titles--DataSchema.json | 48 +-- ...d-vocab-titles--InteractionAffordance.json | 14 +- .../assertions-td/td-vocab-titles--Thing.json | 4 +- .../td-vocab-token--OAuth2SecurityScheme.json | 12 +- .../td-vocab-type--DataSchema_array.json | 44 +-- .../td-vocab-type--DataSchema_boolean.json | 44 +-- .../td-vocab-type--DataSchema_integer.json | 44 +-- .../td-vocab-type--DataSchema_null.json | 44 +-- .../td-vocab-type--DataSchema_number.json | 44 +-- .../td-vocab-type--DataSchema_object.json | 44 +-- .../td-vocab-type--DataSchema_string.json | 44 +-- .../assertions-td/td-vocab-type--Link.json | 4 +- .../td-vocab-unit--DataSchema.json | 44 +-- ...b-uriVariables--InteractionAffordance.json | 26 +- .../td-vocab-writeOnly--DataSchema.json | 44 +-- .../tm-compose-instanceName.json | 4 +- .../assertions-tm/tm-compose-submodel.json | 4 +- .../assertions/assertions-tm/tm-extend.json | 12 +- .../assertions-tm/tm-identification.json | 6 +- .../tm-protocol-security-restriction.json | 60 ++-- .../assertions-tm/tm-tmOptional.json | 4 +- .../assertions/assertions-tm/tm-tmRef1.json | 4 +- packages/core/td-schema-full.json | 304 ++++++++--------- packages/core/td-schema.json | 308 +++++++++--------- 196 files changed, 1922 insertions(+), 1922 deletions(-) diff --git a/packages/assertions/assertions-td/sec-body-name-json-pointer copy.json b/packages/assertions/assertions-td/sec-body-name-json-pointer copy.json index b45858871..ddaa82aa6 100644 --- a/packages/assertions/assertions-td/sec-body-name-json-pointer copy.json +++ b/packages/assertions/assertions-td/sec-body-name-json-pointer copy.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/sec-body-name-json-pointer.json b/packages/assertions/assertions-td/sec-body-name-json-pointer.json index a0749f276..7fd097119 100644 --- a/packages/assertions/assertions-td/sec-body-name-json-pointer.json +++ b/packages/assertions/assertions-td/sec-body-name-json-pointer.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-arrays.json b/packages/assertions/assertions-td/td-action-arrays.json index 9762f4f88..6b83d0406 100644 --- a/packages/assertions/assertions-td/td-action-arrays.json +++ b/packages/assertions/assertions-td/td-action-arrays.json @@ -8,7 +8,7 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, @@ -16,14 +16,14 @@ "actions" ], "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "properties": { "forms": { "type": "array", "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } @@ -37,7 +37,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-action-names_at-type.json b/packages/assertions/assertions-td/td-action-names_at-type.json index db2f05085..d36aef4a8 100644 --- a/packages/assertions/assertions-td/td-action-names_at-type.json +++ b/packages/assertions/assertions-td/td-action-names_at-type.json @@ -7,12 +7,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-names_description.json b/packages/assertions/assertions-td/td-action-names_description.json index d5dc4a661..af74553cf 100644 --- a/packages/assertions/assertions-td/td-action-names_description.json +++ b/packages/assertions/assertions-td/td-action-names_description.json @@ -7,12 +7,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-names_descriptions.json b/packages/assertions/assertions-td/td-action-names_descriptions.json index 0b802bf8e..d06af637e 100644 --- a/packages/assertions/assertions-td/td-action-names_descriptions.json +++ b/packages/assertions/assertions-td/td-action-names_descriptions.json @@ -8,12 +8,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-names_title.json b/packages/assertions/assertions-td/td-action-names_title.json index f080f1456..41b674731 100644 --- a/packages/assertions/assertions-td/td-action-names_title.json +++ b/packages/assertions/assertions-td/td-action-names_title.json @@ -7,12 +7,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-names_titles.json b/packages/assertions/assertions-td/td-action-names_titles.json index bea444195..121d84eef 100644 --- a/packages/assertions/assertions-td/td-action-names_titles.json +++ b/packages/assertions/assertions-td/td-action-names_titles.json @@ -7,12 +7,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-action-names_uriVariables.json b/packages/assertions/assertions-td/td-action-names_uriVariables.json index 423159173..c1ce0a9e2 100644 --- a/packages/assertions/assertions-td/td-action-names_uriVariables.json +++ b/packages/assertions/assertions-td/td-action-names_uriVariables.json @@ -7,12 +7,12 @@ "properties": { "actions": { "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-context-default-language.json b/packages/assertions/assertions-td/td-context-default-language.json index 418ed6f42..397019918 100644 --- a/packages/assertions/assertions-td/td-context-default-language.json +++ b/packages/assertions/assertions-td/td-context-default-language.json @@ -20,7 +20,7 @@ }, "else": { "if": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" }, "then": { "const": "td-context-default-language=pass" @@ -30,7 +30,7 @@ } }, "additionalProperties": true, - "$defs": { + "definitions": { "thing-context-w3c-uri": { "type": "string", "enum": [ @@ -41,7 +41,7 @@ "type": "array", "items": [ { - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" } ], "additionalItems": { diff --git a/packages/assertions/assertions-td/td-context-ns-td10-namespace.json b/packages/assertions/assertions-td/td-context-ns-td10-namespace.json index ea6c205f0..884f74225 100644 --- a/packages/assertions/assertions-td/td-context-ns-td10-namespace.json +++ b/packages/assertions/assertions-td/td-context-ns-td10-namespace.json @@ -10,7 +10,7 @@ ], "properties": { "@context": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" } } }, @@ -18,7 +18,7 @@ "const": "td-context-ns-td10-namespace=pass" }, "additionalProperties": true, - "$defs": { + "definitions": { "thing-context-td-uri-v1": { "type": "string", "const": "https://www.w3.org/2019/wot/td/v1" @@ -32,10 +32,10 @@ "type": "array", "prefixItems": [ { - "$ref": "$defs/thing-context-td-uri-v1" + "$ref": "definitions/thing-context-td-uri-v1" }, { - "$ref": "$defs/thing-context-td-uri-v1.1" + "$ref": "definitions/thing-context-td-uri-v1.1" } ], "contains": { @@ -46,7 +46,7 @@ "additionalItems": { "anyOf": [ { - "$ref": "$defs/anyUri" + "$ref": "definitions/anyUri" }, { "type": "object" diff --git a/packages/assertions/assertions-td/td-context-ns-thing-map-of-namespaces.json b/packages/assertions/assertions-td/td-context-ns-thing-map-of-namespaces.json index ba1db1ef8..52d6dbdd5 100644 --- a/packages/assertions/assertions-td/td-context-ns-thing-map-of-namespaces.json +++ b/packages/assertions/assertions-td/td-context-ns-thing-map-of-namespaces.json @@ -20,7 +20,7 @@ }, "else": { "if": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" }, "then": { "const": "td-context-ns-thing-map-of-namespaces=pass" @@ -30,7 +30,7 @@ } }, "additionalProperties": true, - "$defs": { + "definitions": { "thing-context-w3c-uri": { "type": "string", "enum": [ @@ -41,7 +41,7 @@ "type": "array", "items": [ { - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" } ], "additionalItems": { diff --git a/packages/assertions/assertions-td/td-context-ns-thing-optional.json b/packages/assertions/assertions-td/td-context-ns-thing-optional.json index 648bd4646..621eaeffa 100644 --- a/packages/assertions/assertions-td/td-context-ns-thing-optional.json +++ b/packages/assertions/assertions-td/td-context-ns-thing-optional.json @@ -20,7 +20,7 @@ }, "else": { "if": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" }, "then": { "const": "td-context-ns-thing-optional=pass" @@ -30,7 +30,7 @@ } }, "additionalProperties": true, - "$defs": { + "definitions": { "thing-context-w3c-uri": { "type": "string", "enum": [ @@ -41,11 +41,11 @@ "oneOf": [{ "type": "array", "items": [{ - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" }], "additionalItems": { "anyOf": [{ - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -54,7 +54,7 @@ } }, { - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" } ] }, diff --git a/packages/assertions/assertions-td/td-context.json b/packages/assertions/assertions-td/td-context.json index fa553c05e..8487790fe 100644 --- a/packages/assertions/assertions-td/td-context.json +++ b/packages/assertions/assertions-td/td-context.json @@ -13,7 +13,7 @@ ], "properties": { "@context": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" } } }, @@ -21,7 +21,7 @@ "const": "td-context=pass" }, "additionalProperties": true, - "$defs": { + "definitions": { "thing-context-w3c-uri": { "type": "string", "enum": [ @@ -34,13 +34,13 @@ "type": "array", "items": [ { - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" } ], "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -49,7 +49,7 @@ } }, { - "$ref": "#/$defs/thing-context-w3c-uri" + "$ref": "#/definitions/thing-context-w3c-uri" } ] }, diff --git a/packages/assertions/assertions-td/td-event-arrays.json b/packages/assertions/assertions-td/td-event-arrays.json index ace05de83..264ec445d 100644 --- a/packages/assertions/assertions-td/td-event-arrays.json +++ b/packages/assertions/assertions-td/td-event-arrays.json @@ -8,7 +8,7 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, @@ -16,14 +16,14 @@ "events" ], "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "properties": { "forms": { "type": "array", "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -36,7 +36,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-event-names_at-type.json b/packages/assertions/assertions-td/td-event-names_at-type.json index 5163a04c6..f973136c3 100644 --- a/packages/assertions/assertions-td/td-event-names_at-type.json +++ b/packages/assertions/assertions-td/td-event-names_at-type.json @@ -7,12 +7,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-event-names_description.json b/packages/assertions/assertions-td/td-event-names_description.json index 87fd03489..514a6c300 100644 --- a/packages/assertions/assertions-td/td-event-names_description.json +++ b/packages/assertions/assertions-td/td-event-names_description.json @@ -7,12 +7,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-event-names_descriptions.json b/packages/assertions/assertions-td/td-event-names_descriptions.json index 16ecf35e9..40fac3ce4 100644 --- a/packages/assertions/assertions-td/td-event-names_descriptions.json +++ b/packages/assertions/assertions-td/td-event-names_descriptions.json @@ -8,12 +8,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-event-names_title.json b/packages/assertions/assertions-td/td-event-names_title.json index 999b9cddf..f0fce6410 100644 --- a/packages/assertions/assertions-td/td-event-names_title.json +++ b/packages/assertions/assertions-td/td-event-names_title.json @@ -7,12 +7,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-event-names_titles.json b/packages/assertions/assertions-td/td-event-names_titles.json index 6e3d0df14..f4c3055f8 100644 --- a/packages/assertions/assertions-td/td-event-names_titles.json +++ b/packages/assertions/assertions-td/td-event-names_titles.json @@ -7,12 +7,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-event-names_uriVariables.json b/packages/assertions/assertions-td/td-event-names_uriVariables.json index c635fd276..fa1534e36 100644 --- a/packages/assertions/assertions-td/td-event-names_uriVariables.json +++ b/packages/assertions/assertions-td/td-event-names_uriVariables.json @@ -7,12 +7,12 @@ "properties": { "events": { "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-integer-type.json b/packages/assertions/assertions-td/td-integer-type.json index 26db14f74..f506ead84 100644 --- a/packages/assertions/assertions-td/td-integer-type.json +++ b/packages/assertions/assertions-td/td-integer-type.json @@ -8,24 +8,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -46,29 +46,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,10 +80,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -91,13 +91,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -120,16 +120,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -140,7 +140,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -166,12 +166,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -196,7 +196,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-links.json b/packages/assertions/assertions-td/td-links.json index 1a5698579..566119a3c 100644 --- a/packages/assertions/assertions-td/td-links.json +++ b/packages/assertions/assertions-td/td-links.json @@ -9,7 +9,7 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, @@ -17,15 +17,15 @@ "links" ], "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "type": "object", "properties": { "anchor": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "rel": { "type": "string" diff --git a/packages/assertions/assertions-td/td-number-type.json b/packages/assertions/assertions-td/td-number-type.json index a4a643abf..6dc9a8077 100644 --- a/packages/assertions/assertions-td/td-number-type.json +++ b/packages/assertions/assertions-td/td-number-type.json @@ -8,24 +8,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -46,29 +46,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,10 +80,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -91,13 +91,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -120,16 +120,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -140,7 +140,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -166,12 +166,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -196,7 +196,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-op-for-action.json b/packages/assertions/assertions-td/td-op-for-action.json index c4b97f84d..8eb528102 100644 --- a/packages/assertions/assertions-td/td-op-for-action.json +++ b/packages/assertions/assertions-td/td-op-for-action.json @@ -8,12 +8,12 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "properties": { @@ -21,7 +21,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" } } }, @@ -35,7 +35,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-op-for-event.json b/packages/assertions/assertions-td/td-op-for-event.json index 35139f991..b5af582a7 100644 --- a/packages/assertions/assertions-td/td-op-for-event.json +++ b/packages/assertions/assertions-td/td-op-for-event.json @@ -8,12 +8,12 @@ "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "type": "object", "properties": { @@ -21,7 +21,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" } } }, @@ -35,7 +35,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-op-for-property.json b/packages/assertions/assertions-td/td-op-for-property.json index fb320b027..1d6a8a629 100644 --- a/packages/assertions/assertions-td/td-op-for-property.json +++ b/packages/assertions/assertions-td/td-op-for-property.json @@ -8,12 +8,12 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -21,7 +21,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" } } }, @@ -35,7 +35,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-op-for-thing.json b/packages/assertions/assertions-td/td-op-for-thing.json index f5d3ecebb..54dc267c8 100644 --- a/packages/assertions/assertions-td/td-op-for-thing.json +++ b/packages/assertions/assertions-td/td-op-for-thing.json @@ -9,18 +9,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-property-arrays.json b/packages/assertions/assertions-td/td-property-arrays.json index 5775780a1..8ff7dcb64 100644 --- a/packages/assertions/assertions-td/td-property-arrays.json +++ b/packages/assertions/assertions-td/td-property-arrays.json @@ -9,13 +9,13 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -24,7 +24,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -38,7 +38,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "contentType": { "type": "string" diff --git a/packages/assertions/assertions-td/td-property-names_at-type.json b/packages/assertions/assertions-td/td-property-names_at-type.json index c7921feba..75621f606 100644 --- a/packages/assertions/assertions-td/td-property-names_at-type.json +++ b/packages/assertions/assertions-td/td-property-names_at-type.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_const.json b/packages/assertions/assertions-td/td-property-names_const.json index 01f94f9de..70b0b307d 100644 --- a/packages/assertions/assertions-td/td-property-names_const.json +++ b/packages/assertions/assertions-td/td-property-names_const.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_description.json b/packages/assertions/assertions-td/td-property-names_description.json index f72029a3b..63de4a731 100644 --- a/packages/assertions/assertions-td/td-property-names_description.json +++ b/packages/assertions/assertions-td/td-property-names_description.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_descriptions.json b/packages/assertions/assertions-td/td-property-names_descriptions.json index 51e758863..bf381525b 100644 --- a/packages/assertions/assertions-td/td-property-names_descriptions.json +++ b/packages/assertions/assertions-td/td-property-names_descriptions.json @@ -8,12 +8,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_enum.json b/packages/assertions/assertions-td/td-property-names_enum.json index 8feaedada..ae81a52a0 100644 --- a/packages/assertions/assertions-td/td-property-names_enum.json +++ b/packages/assertions/assertions-td/td-property-names_enum.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_items.json b/packages/assertions/assertions-td/td-property-names_items.json index 7466751f9..e3e9fe56e 100644 --- a/packages/assertions/assertions-td/td-property-names_items.json +++ b/packages/assertions/assertions-td/td-property-names_items.json @@ -8,13 +8,13 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_maxItems.json b/packages/assertions/assertions-td/td-property-names_maxItems.json index ba62e895c..8137b3ce4 100644 --- a/packages/assertions/assertions-td/td-property-names_maxItems.json +++ b/packages/assertions/assertions-td/td-property-names_maxItems.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_maximum.json b/packages/assertions/assertions-td/td-property-names_maximum.json index 8f0160f7d..5dad9b9d5 100644 --- a/packages/assertions/assertions-td/td-property-names_maximum.json +++ b/packages/assertions/assertions-td/td-property-names_maximum.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_minItems.json b/packages/assertions/assertions-td/td-property-names_minItems.json index 3cde36894..da53fbc42 100644 --- a/packages/assertions/assertions-td/td-property-names_minItems.json +++ b/packages/assertions/assertions-td/td-property-names_minItems.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_minimum.json b/packages/assertions/assertions-td/td-property-names_minimum.json index 9c546d7a4..25d571f4d 100644 --- a/packages/assertions/assertions-td/td-property-names_minimum.json +++ b/packages/assertions/assertions-td/td-property-names_minimum.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_oneOf.json b/packages/assertions/assertions-td/td-property-names_oneOf.json index 1f41138be..ef136209c 100644 --- a/packages/assertions/assertions-td/td-property-names_oneOf.json +++ b/packages/assertions/assertions-td/td-property-names_oneOf.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_properties.json b/packages/assertions/assertions-td/td-property-names_properties.json index 25d3f0581..ba25cd0b4 100644 --- a/packages/assertions/assertions-td/td-property-names_properties.json +++ b/packages/assertions/assertions-td/td-property-names_properties.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_readOnly.json b/packages/assertions/assertions-td/td-property-names_readOnly.json index 591877a2a..69fd2eb5f 100644 --- a/packages/assertions/assertions-td/td-property-names_readOnly.json +++ b/packages/assertions/assertions-td/td-property-names_readOnly.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_required.json b/packages/assertions/assertions-td/td-property-names_required.json index 8db03fd1a..ce681cd6b 100644 --- a/packages/assertions/assertions-td/td-property-names_required.json +++ b/packages/assertions/assertions-td/td-property-names_required.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_title.json b/packages/assertions/assertions-td/td-property-names_title.json index d2ff58531..591e3dd49 100644 --- a/packages/assertions/assertions-td/td-property-names_title.json +++ b/packages/assertions/assertions-td/td-property-names_title.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_titles.json b/packages/assertions/assertions-td/td-property-names_titles.json index 8e5e69da8..4fa119916 100644 --- a/packages/assertions/assertions-td/td-property-names_titles.json +++ b/packages/assertions/assertions-td/td-property-names_titles.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_type.json b/packages/assertions/assertions-td/td-property-names_type.json index 56c4e43df..ed3d8e3c2 100644 --- a/packages/assertions/assertions-td/td-property-names_type.json +++ b/packages/assertions/assertions-td/td-property-names_type.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_unit.json b/packages/assertions/assertions-td/td-property-names_unit.json index 3409d11ad..a9172a7c6 100644 --- a/packages/assertions/assertions-td/td-property-names_unit.json +++ b/packages/assertions/assertions-td/td-property-names_unit.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_uriVariables.json b/packages/assertions/assertions-td/td-property-names_uriVariables.json index ff86f91f6..c81244a9f 100644 --- a/packages/assertions/assertions-td/td-property-names_uriVariables.json +++ b/packages/assertions/assertions-td/td-property-names_uriVariables.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-property-names_writeOnly.json b/packages/assertions/assertions-td/td-property-names_writeOnly.json index 98d3106bb..c663e4311 100644 --- a/packages/assertions/assertions-td/td-property-names_writeOnly.json +++ b/packages/assertions/assertions-td/td-property-names_writeOnly.json @@ -7,12 +7,12 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-security-bearer-format-extensions_alg.json b/packages/assertions/assertions-td/td-security-bearer-format-extensions_alg.json index 4283305da..f350bc545 100644 --- a/packages/assertions/assertions-td/td-security-bearer-format-extensions_alg.json +++ b/packages/assertions/assertions-td/td-security-bearer-format-extensions_alg.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string", diff --git a/packages/assertions/assertions-td/td-security-bearer-format-extensions_format.json b/packages/assertions/assertions-td/td-security-bearer-format-extensions_format.json index b5accea7d..2fdb4ebe9 100644 --- a/packages/assertions/assertions-td/td-security-bearer-format-extensions_format.json +++ b/packages/assertions/assertions-td/td-security-bearer-format-extensions_format.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string" diff --git a/packages/assertions/assertions-td/td-security-combo-exclusive-oneof-or-alloff.json b/packages/assertions/assertions-td/td-security-combo-exclusive-oneof-or-alloff.json index c83def679..9ed4f43ef 100644 --- a/packages/assertions/assertions-td/td-security-combo-exclusive-oneof-or-alloff.json +++ b/packages/assertions/assertions-td/td-security-combo-exclusive-oneof-or-alloff.json @@ -9,14 +9,14 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/comboSecurity_element" + "$ref": "#/definitions/comboSecurity_element" } } }, "required": [ "securityDefinitions" ], - "$defs": { + "definitions": { "comboSecurity_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-security-in-query-over-uri.json b/packages/assertions/assertions-td/td-security-in-query-over-uri.json index 253e72605..feb839de9 100644 --- a/packages/assertions/assertions-td/td-security-in-query-over-uri.json +++ b/packages/assertions/assertions-td/td-security-in-query-over-uri.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-security-oauth2-client-flow.json b/packages/assertions/assertions-td/td-security-oauth2-client-flow.json index 3c50abe1f..2692330df 100644 --- a/packages/assertions/assertions-td/td-security-oauth2-client-flow.json +++ b/packages/assertions/assertions-td/td-security-oauth2-client-flow.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -27,7 +27,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -36,10 +36,10 @@ ] }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-security-oauth2-code-flow.json b/packages/assertions/assertions-td/td-security-oauth2-code-flow.json index 7e1a351df..3fba23c69 100644 --- a/packages/assertions/assertions-td/td-security-oauth2-code-flow.json +++ b/packages/assertions/assertions-td/td-security-oauth2-code-flow.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,13 +35,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-security-oauth2-device-flow.json b/packages/assertions/assertions-td/td-security-oauth2-device-flow.json index 5c23e78dd..25753c0e8 100644 --- a/packages/assertions/assertions-td/td-security-oauth2-device-flow.json +++ b/packages/assertions/assertions-td/td-security-oauth2-device-flow.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,10 +35,10 @@ ] }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-string-type.json b/packages/assertions/assertions-td/td-string-type.json index 3e0f0a25f..f5026b109 100644 --- a/packages/assertions/assertions-td/td-string-type.json +++ b/packages/assertions/assertions-td/td-string-type.json @@ -8,24 +8,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -46,29 +46,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,10 +80,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -91,13 +91,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -120,16 +120,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -140,7 +140,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -166,12 +166,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -196,7 +196,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-title-description_descriptions.json b/packages/assertions/assertions-td/td-title-description_descriptions.json index 9146c11ac..da2b676ba 100644 --- a/packages/assertions/assertions-td/td-title-description_descriptions.json +++ b/packages/assertions/assertions-td/td-title-description_descriptions.json @@ -8,10 +8,10 @@ "required": ["descriptions", "description"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -23,35 +23,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true }, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["descriptions", "description"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -62,29 +62,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -98,10 +98,10 @@ "required": ["descriptions", "description"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -112,10 +112,10 @@ "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -126,10 +126,10 @@ "required": ["descriptions", "description"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -139,13 +139,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -156,10 +156,10 @@ "required": ["descriptions", "description"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -169,16 +169,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -189,7 +189,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -215,12 +215,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -243,7 +243,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-title-description_titles.json b/packages/assertions/assertions-td/td-title-description_titles.json index 6ebd6c9b4..eb854de97 100644 --- a/packages/assertions/assertions-td/td-title-description_titles.json +++ b/packages/assertions/assertions-td/td-title-description_titles.json @@ -8,10 +8,10 @@ "required": ["titles", "title"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -23,35 +23,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true }, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["titles", "title"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -62,29 +62,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -98,10 +98,10 @@ "required": ["titles", "title"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -112,10 +112,10 @@ "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -126,10 +126,10 @@ "required": ["titles", "title"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -139,13 +139,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -156,10 +156,10 @@ "required": ["titles", "title"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -169,16 +169,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -189,7 +189,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -215,12 +215,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -243,7 +243,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-additionalResponses--Form.json b/packages/assertions/assertions-td/td-vocab-additionalResponses--Form.json index ebabef05f..18ab7d4b9 100644 --- a/packages/assertions/assertions-td/td-vocab-additionalResponses--Form.json +++ b/packages/assertions/assertions-td/td-vocab-additionalResponses--Form.json @@ -9,30 +9,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -40,7 +40,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -56,7 +56,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -72,7 +72,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -89,12 +89,12 @@ "additionalResponses": { "oneOff": [ { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" }, { "type": "array", "items": { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-alg--BearerSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-alg--BearerSecurityScheme.json index adf1f278e..19d945bca 100644 --- a/packages/assertions/assertions-td/td-vocab-alg--BearerSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-alg--BearerSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-allOf--ComboSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-allOf--ComboSecurityScheme.json index 571eb79f2..76ff5a004 100644 --- a/packages/assertions/assertions-td/td-vocab-allOf--ComboSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-allOf--ComboSecurityScheme.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/comboSecurity_element" + "$ref": "#/definitions/comboSecurity_element" } } }, @@ -19,7 +19,7 @@ ], "additionalProperties": true, - "$defs": { + "definitions": { "comboSecurity_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-anchor--Link.json b/packages/assertions/assertions-td/td-vocab-anchor--Link.json index 28c105f03..e01a95855 100644 --- a/packages/assertions/assertions-td/td-vocab-anchor--Link.json +++ b/packages/assertions/assertions-td/td-vocab-anchor--Link.json @@ -8,18 +8,18 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", "properties": { "anchor": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" } }, "required": [ diff --git a/packages/assertions/assertions-td/td-vocab-at-type--DataSchema.json b/packages/assertions/assertions-td/td-vocab-at-type--DataSchema.json index dd6847861..9e1b067e1 100644 --- a/packages/assertions/assertions-td/td-vocab-at-type--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-at-type--DataSchema.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -105,7 +105,7 @@ "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, @@ -115,16 +115,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -135,7 +135,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -161,12 +161,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -189,7 +189,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-at-type--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-at-type--InteractionAffordance.json index f855f5670..af28651eb 100644 --- a/packages/assertions/assertions-td/td-vocab-at-type--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-at-type--InteractionAffordance.json @@ -8,31 +8,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, @@ -46,7 +46,7 @@ "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, @@ -60,7 +60,7 @@ "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-at-type--SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-at-type--SecurityScheme.json index 7b079aa9f..457b6d9de 100644 --- a/packages/assertions/assertions-td/td-vocab-at-type--SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-at-type--SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,13 +17,13 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "type": "object", "if": { "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } }, "required": ["@type"] diff --git a/packages/assertions/assertions-td/td-vocab-at-type--Thing.json b/packages/assertions/assertions-td/td-vocab-at-type--Thing.json index 7a62c5b7d..a474b2276 100644 --- a/packages/assertions/assertions-td/td-vocab-at-type--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-at-type--Thing.json @@ -7,7 +7,7 @@ "required": ["@type"], "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" } } }, @@ -15,7 +15,7 @@ "const": "td-vocab-at-type--Thing=pass" }, "additionalProperties": true, - "$defs": { + "definitions": { "type_declaration": { "oneOf": [{ "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-authorization--BearerSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-authorization--BearerSecurityScheme.json index 6e9c05a06..b057525f7 100644 --- a/packages/assertions/assertions-td/td-vocab-authorization--BearerSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-authorization--BearerSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-authorization--OAuth2SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-authorization--OAuth2SecurityScheme.json index 6c8307170..300464cbb 100644 --- a/packages/assertions/assertions-td/td-vocab-authorization--OAuth2SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-authorization--OAuth2SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,13 +35,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "type": "array", diff --git a/packages/assertions/assertions-td/td-vocab-cancellation--EventAffordance.json b/packages/assertions/assertions-td/td-vocab-cancellation--EventAffordance.json index 8261d5a2d..e24d3825f 100644 --- a/packages/assertions/assertions-td/td-vocab-cancellation--EventAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-cancellation--EventAffordance.json @@ -9,18 +9,18 @@ "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "if":{ "type": "object", "properties": { "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": [ @@ -42,10 +42,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -56,7 +56,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -82,12 +82,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -112,7 +112,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-const--DataSchema.json b/packages/assertions/assertions-td/td-vocab-const--DataSchema.json index eb498c02e..474f76d9a 100644 --- a/packages/assertions/assertions-td/td-vocab-const--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-const--DataSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -42,29 +42,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -76,10 +76,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -87,13 +87,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -111,16 +111,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -131,7 +131,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -157,12 +157,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -187,7 +187,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-contentCoding.json b/packages/assertions/assertions-td/td-vocab-contentCoding.json index d707562b3..859230896 100644 --- a/packages/assertions/assertions-td/td-vocab-contentCoding.json +++ b/packages/assertions/assertions-td/td-vocab-contentCoding.json @@ -9,32 +9,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -42,7 +42,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -58,7 +58,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -74,7 +74,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-contentEncoding--StringSchema.json b/packages/assertions/assertions-td/td-vocab-contentEncoding--StringSchema.json index 6c05e2e34..efcd8d89e 100644 --- a/packages/assertions/assertions-td/td-vocab-contentEncoding--StringSchema.json +++ b/packages/assertions/assertions-td/td-vocab-contentEncoding--StringSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -77,16 +77,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -97,7 +97,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -123,12 +123,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -153,7 +153,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-contentMediaType--StringSchema.json b/packages/assertions/assertions-td/td-vocab-contentMediaType--StringSchema.json index 47675c9ad..51a1317df 100644 --- a/packages/assertions/assertions-td/td-vocab-contentMediaType--StringSchema.json +++ b/packages/assertions/assertions-td/td-vocab-contentMediaType--StringSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -77,16 +77,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -97,7 +97,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -123,12 +123,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -153,7 +153,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-contentType--AdditionalExpectedResponse.json b/packages/assertions/assertions-td/td-vocab-contentType--AdditionalExpectedResponse.json index cf9c16473..6771431ba 100644 --- a/packages/assertions/assertions-td/td-vocab-contentType--AdditionalExpectedResponse.json +++ b/packages/assertions/assertions-td/td-vocab-contentType--AdditionalExpectedResponse.json @@ -10,30 +10,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -41,7 +41,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -57,7 +57,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -73,7 +73,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -90,12 +90,12 @@ "additionalResponses": { "oneOff": [ { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" }, { "type": "array", "items": { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-contentType-Form.json b/packages/assertions/assertions-td/td-vocab-contentType-Form.json index 4c49efe48..3e3e5571d 100644 --- a/packages/assertions/assertions-td/td-vocab-contentType-Form.json +++ b/packages/assertions/assertions-td/td-vocab-contentType-Form.json @@ -9,32 +9,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -42,7 +42,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -58,7 +58,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -74,7 +74,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-data--EventAffordance.json b/packages/assertions/assertions-td/td-vocab-data--EventAffordance.json index 041163d03..00b1072f1 100644 --- a/packages/assertions/assertions-td/td-vocab-data--EventAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-data--EventAffordance.json @@ -9,18 +9,18 @@ "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "if": { "type": "object", "properties": { "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": [ @@ -42,10 +42,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -56,7 +56,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -82,12 +82,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -112,7 +112,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-dataResponse--EventAffordance.json b/packages/assertions/assertions-td/td-vocab-dataResponse--EventAffordance.json index 7f515ce07..a85b882be 100644 --- a/packages/assertions/assertions-td/td-vocab-dataResponse--EventAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-dataResponse--EventAffordance.json @@ -9,18 +9,18 @@ "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "if": { "type": "object", "properties": { "dataResponse": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": [ @@ -42,10 +42,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -56,7 +56,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -82,12 +82,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -112,7 +112,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-default--DataSchema.json b/packages/assertions/assertions-td/td-vocab-default--DataSchema.json index 15c6abd15..ac79a9112 100644 --- a/packages/assertions/assertions-td/td-vocab-default--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-default--DataSchema.json @@ -8,35 +8,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -44,13 +44,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -65,16 +65,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -85,7 +85,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -111,12 +111,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -141,7 +141,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-description--DataSchema.json b/packages/assertions/assertions-td/td-vocab-description--DataSchema.json index 10dc449a7..6b693f9d3 100644 --- a/packages/assertions/assertions-td/td-vocab-description--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-description--DataSchema.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,7 +80,7 @@ "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -90,10 +90,10 @@ "else": { "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -104,7 +104,7 @@ "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -114,13 +114,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -131,7 +131,7 @@ "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -141,16 +141,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -161,7 +161,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -187,12 +187,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -215,7 +215,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-description--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-description--InteractionAffordance.json index e4b6f0add..bd5c590ed 100644 --- a/packages/assertions/assertions-td/td-vocab-description--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-description--InteractionAffordance.json @@ -8,31 +8,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -43,29 +43,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -79,7 +79,7 @@ "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -90,10 +90,10 @@ "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -104,7 +104,7 @@ "required": ["description"], "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } } }, @@ -114,13 +114,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -129,16 +129,16 @@ "type": "object", "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -149,7 +149,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -175,12 +175,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -201,7 +201,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-description--SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-description--SecurityScheme.json index c20d7a340..54b9095f7 100644 --- a/packages/assertions/assertions-td/td-vocab-description--SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-description--SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-description--Thing.json b/packages/assertions/assertions-td/td-vocab-description--Thing.json index d49ce0ab1..e0cdb4592 100644 --- a/packages/assertions/assertions-td/td-vocab-description--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-description--Thing.json @@ -6,11 +6,11 @@ "type": "object", "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" } }, "required": ["description"], - "$defs": { + "definitions": { "description": { "type": "string" } diff --git a/packages/assertions/assertions-td/td-vocab-descriptions--DataSchema.json b/packages/assertions/assertions-td/td-vocab-descriptions--DataSchema.json index 1d71cc701..1cd9c0de4 100644 --- a/packages/assertions/assertions-td/td-vocab-descriptions--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-descriptions--DataSchema.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,7 +80,7 @@ "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -91,10 +91,10 @@ "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -105,7 +105,7 @@ "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -115,13 +115,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -132,7 +132,7 @@ "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -142,16 +142,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -162,7 +162,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -188,12 +188,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -216,7 +216,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-descriptions--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-descriptions--InteractionAffordance.json index caf83a5da..6cab0257c 100644 --- a/packages/assertions/assertions-td/td-vocab-descriptions--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-descriptions--InteractionAffordance.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,7 +80,7 @@ "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -91,10 +91,10 @@ "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -105,7 +105,7 @@ "required": ["descriptions"], "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } } }, @@ -115,13 +115,13 @@ "else": { "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -130,16 +130,16 @@ "type": "object", "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -150,7 +150,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -176,12 +176,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -204,7 +204,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-descriptions--SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-descriptions--SecurityScheme.json index d707eafc7..33b88f3d4 100644 --- a/packages/assertions/assertions-td/td-vocab-descriptions--SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-descriptions--SecurityScheme.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,13 +18,13 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } }, "required": [ diff --git a/packages/assertions/assertions-td/td-vocab-descriptions--Thing.json b/packages/assertions/assertions-td/td-vocab-descriptions--Thing.json index 7e63606c5..486a66d97 100644 --- a/packages/assertions/assertions-td/td-vocab-descriptions--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-descriptions--Thing.json @@ -7,11 +7,11 @@ "type": "object", "properties": { "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" } }, "required": ["descriptions"], - "$defs": { + "definitions": { "descriptions": { "type": "object", "additionalProperties": { diff --git a/packages/assertions/assertions-td/td-vocab-enum--DataSchema.json b/packages/assertions/assertions-td/td-vocab-enum--DataSchema.json index 706920a0d..35c84d7dd 100644 --- a/packages/assertions/assertions-td/td-vocab-enum--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-enum--DataSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -46,29 +46,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,10 +80,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -91,13 +91,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -119,16 +119,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -139,7 +139,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -165,12 +165,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -195,7 +195,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--IntegerSchema.json b/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--IntegerSchema.json index 2d385ac6f..d40609cc7 100644 --- a/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--IntegerSchema.json +++ b/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--IntegerSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--NumberSchema.json b/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--NumberSchema.json index cd36adb88..8cf3d9706 100644 --- a/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--NumberSchema.json +++ b/packages/assertions/assertions-td/td-vocab-exclusiveMaximum--NumberSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--IntegerSchema.json b/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--IntegerSchema.json index 7336dd0de..a0a525e6a 100644 --- a/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--IntegerSchema.json +++ b/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--IntegerSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--NumberSchema.json b/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--NumberSchema.json index 51d1b023a..434a46d6d 100644 --- a/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--NumberSchema.json +++ b/packages/assertions/assertions-td/td-vocab-exclusiveMinimum--NumberSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-flow--OAuth2SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-flow--OAuth2SecurityScheme.json index babc7df3c..7216b4d99 100644 --- a/packages/assertions/assertions-td/td-vocab-flow--OAuth2SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-flow--OAuth2SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,13 +35,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "type": "array", diff --git a/packages/assertions/assertions-td/td-vocab-format--BearerSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-format--BearerSecurityScheme.json index e43788199..f48b0a9e5 100644 --- a/packages/assertions/assertions-td/td-vocab-format--BearerSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-format--BearerSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-format--DataSchema.json b/packages/assertions/assertions-td/td-vocab-format--DataSchema.json index 7f0c5bf93..3cb58e7e3 100644 --- a/packages/assertions/assertions-td/td-vocab-format--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-format--DataSchema.json @@ -1,6 +1,6 @@ { "title": "td-vocab-format--DataSchema", - "description": "format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) $defs. . MAY be included. Type: string.", + "description": "format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) definitions. . MAY be included. Type: string.", "$schema": "http://json-schema.org/draft-07/schema#", "also": ["td-data-schema_format", "td-format-validation-known-values", "td-property-names_format"], "is-complex": true, @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -117,7 +117,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "type": { @@ -134,19 +134,19 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-forms--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-forms--InteractionAffordance.json index ad78643c7..1ba3dcf18 100644 --- a/packages/assertions/assertions-td/td-vocab-forms--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-forms--InteractionAffordance.json @@ -9,25 +9,25 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -36,7 +36,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -54,7 +54,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -72,7 +72,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -86,7 +86,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "contentType": { "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-forms--Thing.json b/packages/assertions/assertions-td/td-vocab-forms--Thing.json index 8389adc5f..80b6160c0 100644 --- a/packages/assertions/assertions-td/td-vocab-forms--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-forms--Thing.json @@ -10,7 +10,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, @@ -18,12 +18,12 @@ "forms" ], "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-hreflang--Link.json b/packages/assertions/assertions-td/td-vocab-hreflang--Link.json index 4f47fc924..325832de7 100644 --- a/packages/assertions/assertions-td/td-vocab-hreflang--Link.json +++ b/packages/assertions/assertions-td/td-vocab-hreflang--Link.json @@ -8,23 +8,23 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", "properties": { "hreflang": { "anyOf":[ - {"$ref": "#/$defs/bcp47_string"}, + {"$ref": "#/definitions/bcp47_string"}, { "type":"array", "items":{ - "$ref": "#/$defs/bcp47_string" + "$ref": "#/definitions/bcp47_string" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-idempotent--ActionAffordance.json b/packages/assertions/assertions-td/td-vocab-idempotent--ActionAffordance.json index 72b9a64c6..61f5bb2ed 100644 --- a/packages/assertions/assertions-td/td-vocab-idempotent--ActionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-idempotent--ActionAffordance.json @@ -9,12 +9,12 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-identity--PSKSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-identity--PSKSecurityScheme.json index d0e979590..fc50b896a 100644 --- a/packages/assertions/assertions-td/td-vocab-identity--PSKSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-identity--PSKSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", diff --git a/packages/assertions/assertions-td/td-vocab-in--APIKeySecurityScheme.json b/packages/assertions/assertions-td/td-vocab-in--APIKeySecurityScheme.json index 09f554c4a..5a26105d9 100644 --- a/packages/assertions/assertions-td/td-vocab-in--APIKeySecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-in--APIKeySecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-in--BasicSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-in--BasicSecurityScheme.json index d4ea1cedc..5314aea85 100644 --- a/packages/assertions/assertions-td/td-vocab-in--BasicSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-in--BasicSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-in--BearerSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-in--BearerSecurityScheme.json index d54042fe4..be7765a39 100644 --- a/packages/assertions/assertions-td/td-vocab-in--BearerSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-in--BearerSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-in--DigestSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-in--DigestSecurityScheme.json index d02ff2c71..8bac69e51 100644 --- a/packages/assertions/assertions-td/td-vocab-in--DigestSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-in--DigestSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-input--ActionAffordance.json b/packages/assertions/assertions-td/td-vocab-input--ActionAffordance.json index e1942ec1a..11279bcfc 100644 --- a/packages/assertions/assertions-td/td-vocab-input--ActionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-input--ActionAffordance.json @@ -9,18 +9,18 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "if": { "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": [ @@ -42,10 +42,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -56,7 +56,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -82,12 +82,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -112,7 +112,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-items--ArraySchema.json b/packages/assertions/assertions-td/td-vocab-items--ArraySchema.json index 54ba7c5f3..bbc3a4469 100644 --- a/packages/assertions/assertions-td/td-vocab-items--ArraySchema.json +++ b/packages/assertions/assertions-td/td-vocab-items--ArraySchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -34,12 +34,12 @@ "properties": { "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -53,29 +53,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -87,10 +87,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -98,13 +98,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -115,12 +115,12 @@ "properties": { "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -133,16 +133,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -153,7 +153,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -179,12 +179,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -209,7 +209,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-maxItems--ArraySchema.json b/packages/assertions/assertions-td/td-vocab-maxItems--ArraySchema.json index bf9b658d6..95f9a6da3 100644 --- a/packages/assertions/assertions-td/td-vocab-maxItems--ArraySchema.json +++ b/packages/assertions/assertions-td/td-vocab-maxItems--ArraySchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -45,29 +45,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -79,10 +79,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -90,13 +90,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -117,16 +117,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -137,7 +137,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -163,12 +163,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -191,7 +191,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-maxLength--StringSchema.json b/packages/assertions/assertions-td/td-vocab-maxLength--StringSchema.json index a6b0ffcab..f1ab57a8a 100644 --- a/packages/assertions/assertions-td/td-vocab-maxLength--StringSchema.json +++ b/packages/assertions/assertions-td/td-vocab-maxLength--StringSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -79,29 +79,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-maximum--IntegerSchema.json b/packages/assertions/assertions-td/td-vocab-maximum--IntegerSchema.json index 2847262e3..6e8a259a9 100644 --- a/packages/assertions/assertions-td/td-vocab-maximum--IntegerSchema.json +++ b/packages/assertions/assertions-td/td-vocab-maximum--IntegerSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -50,29 +50,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -84,10 +84,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -95,13 +95,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -127,16 +127,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -147,7 +147,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -173,12 +173,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -203,7 +203,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-maximum--NumberSchema.json b/packages/assertions/assertions-td/td-vocab-maximum--NumberSchema.json index 40c030373..cd097f10d 100644 --- a/packages/assertions/assertions-td/td-vocab-maximum--NumberSchema.json +++ b/packages/assertions/assertions-td/td-vocab-maximum--NumberSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -50,29 +50,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -84,10 +84,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -95,13 +95,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -127,16 +127,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -147,7 +147,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -173,12 +173,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -203,7 +203,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-minItems--ArraySchema.json b/packages/assertions/assertions-td/td-vocab-minItems--ArraySchema.json index 830fb3c0d..5397eacd0 100644 --- a/packages/assertions/assertions-td/td-vocab-minItems--ArraySchema.json +++ b/packages/assertions/assertions-td/td-vocab-minItems--ArraySchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -45,29 +45,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -79,10 +79,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -90,13 +90,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -117,16 +117,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -137,7 +137,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -163,12 +163,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -193,7 +193,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-minLength--StringSchema.json b/packages/assertions/assertions-td/td-vocab-minLength--StringSchema.json index c5d09c0fa..a626e451c 100644 --- a/packages/assertions/assertions-td/td-vocab-minLength--StringSchema.json +++ b/packages/assertions/assertions-td/td-vocab-minLength--StringSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -79,29 +79,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-minimum--IntegerSchema.json b/packages/assertions/assertions-td/td-vocab-minimum--IntegerSchema.json index ac345dbf8..5b17d0728 100644 --- a/packages/assertions/assertions-td/td-vocab-minimum--IntegerSchema.json +++ b/packages/assertions/assertions-td/td-vocab-minimum--IntegerSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -50,29 +50,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -84,10 +84,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -95,13 +95,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -127,16 +127,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -147,7 +147,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -173,12 +173,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -203,7 +203,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-minimum--NumberSchema.json b/packages/assertions/assertions-td/td-vocab-minimum--NumberSchema.json index c2ddc9eae..07e3f28a9 100644 --- a/packages/assertions/assertions-td/td-vocab-minimum--NumberSchema.json +++ b/packages/assertions/assertions-td/td-vocab-minimum--NumberSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -50,29 +50,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -84,10 +84,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -95,13 +95,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -127,16 +127,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -147,7 +147,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -173,12 +173,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -203,7 +203,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-multipleOf--IntegerSchema.json b/packages/assertions/assertions-td/td-vocab-multipleOf--IntegerSchema.json index 74f241ee3..766337e9d 100644 --- a/packages/assertions/assertions-td/td-vocab-multipleOf--IntegerSchema.json +++ b/packages/assertions/assertions-td/td-vocab-multipleOf--IntegerSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-multipleOf--NumberSchema.json b/packages/assertions/assertions-td/td-vocab-multipleOf--NumberSchema.json index 5b60946dd..4e3e058b8 100644 --- a/packages/assertions/assertions-td/td-vocab-multipleOf--NumberSchema.json +++ b/packages/assertions/assertions-td/td-vocab-multipleOf--NumberSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -78,29 +78,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-name--APIKeySecurityScheme.json b/packages/assertions/assertions-td/td-vocab-name--APIKeySecurityScheme.json index fc87d761c..7bb73304e 100644 --- a/packages/assertions/assertions-td/td-vocab-name--APIKeySecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-name--APIKeySecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", diff --git a/packages/assertions/assertions-td/td-vocab-name--BasicSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-name--BasicSecurityScheme.json index 1c2cf0781..9cf1c6b28 100644 --- a/packages/assertions/assertions-td/td-vocab-name--BasicSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-name--BasicSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", diff --git a/packages/assertions/assertions-td/td-vocab-name--BearerSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-name--BearerSecurityScheme.json index 3862dbb1f..2a93c2752 100644 --- a/packages/assertions/assertions-td/td-vocab-name--BearerSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-name--BearerSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,7 +35,7 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "alg": { "type": "string" diff --git a/packages/assertions/assertions-td/td-vocab-name--DigestSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-name--DigestSecurityScheme.json index ace14db11..0d3efcb7f 100644 --- a/packages/assertions/assertions-td/td-vocab-name--DigestSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-name--DigestSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", diff --git a/packages/assertions/assertions-td/td-vocab-observable--PropertyAffordance.json b/packages/assertions/assertions-td/td-vocab-observable--PropertyAffordance.json index 6eb9b5cb0..0c2e663cb 100644 --- a/packages/assertions/assertions-td/td-vocab-observable--PropertyAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-observable--PropertyAffordance.json @@ -9,12 +9,12 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-oneOf--ComboSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-oneOf--ComboSecurityScheme.json index 5b8478113..c8a580325 100644 --- a/packages/assertions/assertions-td/td-vocab-oneOf--ComboSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-oneOf--ComboSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/comboSecurity_element" + "$ref": "#/definitions/comboSecurity_element" } } }, @@ -18,7 +18,7 @@ ], "additionalProperties": true, - "$defs": { + "definitions": { "comboSecurity_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-oneOf--DataSchema.json b/packages/assertions/assertions-td/td-vocab-oneOf--DataSchema.json index c1bc83564..2f099f3e0 100644 --- a/packages/assertions/assertions-td/td-vocab-oneOf--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-oneOf--DataSchema.json @@ -9,25 +9,25 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -36,7 +36,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -48,29 +48,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -82,10 +82,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -93,13 +93,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -111,7 +111,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -122,16 +122,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -142,7 +142,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -168,12 +168,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -198,7 +198,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json index 4fe1d8e76..41fc9c64f 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json index 10087e7b9..f216ff979 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_observeallproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_observeallproperties.json index 9c392afb6..b7320bcb3 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_observeallproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_observeallproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json index 6915b81da..23e58fb92 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json index a87ee94c3..6be63e013 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_queryallactions.json b/packages/assertions/assertions-td/td-vocab-op--Form_queryallactions.json index 6d1f99c59..cf6c8573e 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_queryallactions.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_queryallactions.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_readallproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_readallproperties.json index c8aa69219..015bccc11 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_readallproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_readallproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_readmultipleproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_readmultipleproperties.json index 5b072884f..6597c7ee6 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_readmultipleproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_readmultipleproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json index 0ee1387f0..71ab042fc 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json @@ -9,12 +9,12 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -22,7 +22,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeallevents.json b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeallevents.json index 2e70e8279..89778877a 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeallevents.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeallevents.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json index 54db9daaf..d7607da3f 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveallproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveallproperties.json index 362ea96d6..f86755956 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveallproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveallproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json index 4f8fb556d..2b578f21b 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeallevents.json b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeallevents.json index 0277d9813..0676fe924 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeallevents.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeallevents.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json index 934222e1a..3219ded9f 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_writeallproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_writeallproperties.json index 526d9763a..44f00046e 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_writeallproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_writeallproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_writemultipleproperties.json b/packages/assertions/assertions-td/td-vocab-op--Form_writemultipleproperties.json index a444c48b3..076da8330 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_writemultipleproperties.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_writemultipleproperties.json @@ -10,18 +10,18 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "form_element_root": { "if": { "type": "object", "properties": { "href": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "op": { "oneOf": [{ diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json index e05d010a9..fa498f6f0 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json @@ -9,12 +9,12 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -22,7 +22,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-output--ActionAffordance.json b/packages/assertions/assertions-td/td-vocab-output--ActionAffordance.json index 130f6d5ac..923d3a65f 100644 --- a/packages/assertions/assertions-td/td-vocab-output--ActionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-output--ActionAffordance.json @@ -9,12 +9,12 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "if": { @@ -38,10 +38,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -52,7 +52,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -78,12 +78,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -108,7 +108,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-pattern--StringSchema.json b/packages/assertions/assertions-td/td-vocab-pattern--StringSchema.json index 938f6614e..c3a8a48ff 100644 --- a/packages/assertions/assertions-td/td-vocab-pattern--StringSchema.json +++ b/packages/assertions/assertions-td/td-vocab-pattern--StringSchema.json @@ -9,35 +9,35 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "action_element": { "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -45,13 +45,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -77,16 +77,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -97,7 +97,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -123,12 +123,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -153,7 +153,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-profile--Thing.json b/packages/assertions/assertions-td/td-vocab-profile--Thing.json index e5bd2af49..da7b806e1 100644 --- a/packages/assertions/assertions-td/td-vocab-profile--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-profile--Thing.json @@ -8,18 +8,18 @@ "profile": { "oneof": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "array", "items": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" } } ] } }, - "$defs": { + "definitions": { "anyUri": { "type": "string", "format": "iri-reference" diff --git a/packages/assertions/assertions-td/td-vocab-properties--ObjectSchema.json b/packages/assertions/assertions-td/td-vocab-properties--ObjectSchema.json index 7f86f316d..d44d445de 100644 --- a/packages/assertions/assertions-td/td-vocab-properties--ObjectSchema.json +++ b/packages/assertions/assertions-td/td-vocab-properties--ObjectSchema.json @@ -1,6 +1,6 @@ { "title": "td-vocab-properties--ObjectSchema", - "description": "properties: Data schema nested $defs. MAY be included. Type: DataSchema.", + "description": "properties: Data schema nested definitions. MAY be included. Type: DataSchema.", "$schema": "http://json-schema.org/draft-07/schema#", "is-complex": true, "also": ["td-data-schema_properties", "td-data-schema-objects"], @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -34,7 +34,7 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -46,29 +46,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -80,10 +80,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -91,13 +91,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -108,7 +108,7 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -119,16 +119,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -139,7 +139,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -165,12 +165,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -195,7 +195,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-proxy--SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-proxy--SecurityScheme.json index 90ce0079b..24ce584f1 100644 --- a/packages/assertions/assertions-td/td-vocab-proxy--SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-proxy--SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,13 +17,13 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "type": "object", "if": { "properties": { "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" } }, "required": ["proxy"] diff --git a/packages/assertions/assertions-td/td-vocab-qop--DigestSecurityScheme.json b/packages/assertions/assertions-td/td-vocab-qop--DigestSecurityScheme.json index a1eda4424..5b559e4fe 100644 --- a/packages/assertions/assertions-td/td-vocab-qop--DigestSecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-qop--DigestSecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "oneOf": [{ @@ -27,7 +27,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", diff --git a/packages/assertions/assertions-td/td-vocab-readOnly--DataSchema.json b/packages/assertions/assertions-td/td-vocab-readOnly--DataSchema.json index f75f08e93..96ad9d543 100644 --- a/packages/assertions/assertions-td/td-vocab-readOnly--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-readOnly--DataSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -115,16 +115,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -135,7 +135,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -161,12 +161,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -189,7 +189,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-refresh--OAuth2SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-refresh--OAuth2SecurityScheme.json index 741fd6b7a..a2c935ea4 100644 --- a/packages/assertions/assertions-td/td-vocab-refresh--OAuth2SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-refresh--OAuth2SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "oneOf": [{ @@ -27,7 +27,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -36,13 +36,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "type": "array", diff --git a/packages/assertions/assertions-td/td-vocab-rel--Link.json b/packages/assertions/assertions-td/td-vocab-rel--Link.json index 50279ef1e..a3472cc92 100644 --- a/packages/assertions/assertions-td/td-vocab-rel--Link.json +++ b/packages/assertions/assertions-td/td-vocab-rel--Link.json @@ -8,12 +8,12 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-required--ObjectSchema.json b/packages/assertions/assertions-td/td-vocab-required--ObjectSchema.json index 36c78409c..fb06d6c00 100644 --- a/packages/assertions/assertions-td/td-vocab-required--ObjectSchema.json +++ b/packages/assertions/assertions-td/td-vocab-required--ObjectSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -47,29 +47,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-response--Form.json b/packages/assertions/assertions-td/td-vocab-response--Form.json index 1eb0ea328..27cf37121 100644 --- a/packages/assertions/assertions-td/td-vocab-response--Form.json +++ b/packages/assertions/assertions-td/td-vocab-response--Form.json @@ -10,32 +10,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -43,7 +43,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -59,7 +59,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -75,7 +75,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-safe--ActionAffordance.json b/packages/assertions/assertions-td/td-vocab-safe--ActionAffordance.json index d5b6a1457..524f1dc8e 100644 --- a/packages/assertions/assertions-td/td-vocab-safe--ActionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-safe--ActionAffordance.json @@ -9,12 +9,12 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-schema--AdditionalExpectedResponse.json b/packages/assertions/assertions-td/td-vocab-schema--AdditionalExpectedResponse.json index 34fbc53dd..a801e4761 100644 --- a/packages/assertions/assertions-td/td-vocab-schema--AdditionalExpectedResponse.json +++ b/packages/assertions/assertions-td/td-vocab-schema--AdditionalExpectedResponse.json @@ -10,30 +10,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -41,7 +41,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -57,7 +57,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -73,7 +73,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -90,12 +90,12 @@ "additionalResponses": { "oneOff": [ { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" }, { "type": "array", "items": { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_apikey.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_apikey.json index 62a406bcb..9c7dcac12 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_apikey.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_apikey.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_auto.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_auto.json index 45d31662c..ba854d3d9 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_auto.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_auto.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_basic.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_basic.json index 153b5956e..9bf7ad6e7 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_basic.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_basic.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_bearer.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_bearer.json index 34f72b508..c349eb035 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_bearer.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_bearer.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_digest.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_digest.json index 555046233..446b77f28 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_digest.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_digest.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_nosec.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_nosec.json index 84a10137e..4d63b745c 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_nosec.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_nosec.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_oauth2.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_oauth2.json index 3c3b6bfc6..d7967a420 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_oauth2.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_oauth2.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_psk.json b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_psk.json index e6f524ce8..8ea97a40e 100644 --- a/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_psk.json +++ b/packages/assertions/assertions-td/td-vocab-scheme--SecurityScheme_psk.json @@ -10,7 +10,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -18,7 +18,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-scopes--Form.json b/packages/assertions/assertions-td/td-vocab-scopes--Form.json index e144ff390..dbdb0861d 100644 --- a/packages/assertions/assertions-td/td-vocab-scopes--Form.json +++ b/packages/assertions/assertions-td/td-vocab-scopes--Form.json @@ -9,30 +9,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -40,7 +40,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -55,7 +55,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -70,7 +70,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-scopes--OAuth2SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-scopes--OAuth2SecurityScheme.json index b6dc740c0..bc3b33bb8 100644 --- a/packages/assertions/assertions-td/td-vocab-scopes--OAuth2SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-scopes--OAuth2SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "type": "object", @@ -26,7 +26,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -35,13 +35,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "type": "array", diff --git a/packages/assertions/assertions-td/td-vocab-security--Form.json b/packages/assertions/assertions-td/td-vocab-security--Form.json index 2950a97c5..fe9ab0d8f 100644 --- a/packages/assertions/assertions-td/td-vocab-security--Form.json +++ b/packages/assertions/assertions-td/td-vocab-security--Form.json @@ -10,30 +10,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -41,7 +41,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -57,7 +57,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -73,7 +73,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-sizes--Link.json b/packages/assertions/assertions-td/td-vocab-sizes--Link.json index 0b82d8c69..c5576d026 100644 --- a/packages/assertions/assertions-td/td-vocab-sizes--Link.json +++ b/packages/assertions/assertions-td/td-vocab-sizes--Link.json @@ -8,12 +8,12 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-subprotocol--Form.json b/packages/assertions/assertions-td/td-vocab-subprotocol--Form.json index 40b452110..ec953a6bf 100644 --- a/packages/assertions/assertions-td/td-vocab-subprotocol--Form.json +++ b/packages/assertions/assertions-td/td-vocab-subprotocol--Form.json @@ -9,32 +9,32 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -42,7 +42,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -58,7 +58,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -74,7 +74,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-subscription--EventAffordance.json b/packages/assertions/assertions-td/td-vocab-subscription--EventAffordance.json index b20710753..239fd939d 100644 --- a/packages/assertions/assertions-td/td-vocab-subscription--EventAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-subscription--EventAffordance.json @@ -9,18 +9,18 @@ "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "event_element": { "if": { "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": [ @@ -42,10 +42,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -56,7 +56,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -82,12 +82,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -112,7 +112,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-success--AdditionalExpectedResponse.json b/packages/assertions/assertions-td/td-vocab-success--AdditionalExpectedResponse.json index 39a734f1a..b7daf06a8 100644 --- a/packages/assertions/assertions-td/td-vocab-success--AdditionalExpectedResponse.json +++ b/packages/assertions/assertions-td/td-vocab-success--AdditionalExpectedResponse.json @@ -9,30 +9,30 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, - "$defs": { + "definitions": { "property_element": { "type": "object", "properties": { @@ -40,7 +40,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -56,7 +56,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -72,7 +72,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element" + "$ref": "#/definitions/form_element" } } }, @@ -89,12 +89,12 @@ "additionalResponses": { "oneOff": [ { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" }, { "type": "array", "items": { - "$ref": "#/$defs/additionalResponse_element" + "$ref": "#/definitions/additionalResponse_element" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-synchronous--ActionAffordance.json b/packages/assertions/assertions-td/td-vocab-synchronous--ActionAffordance.json index 0bd881dbb..4808b12fb 100644 --- a/packages/assertions/assertions-td/td-vocab-synchronous--ActionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-synchronous--ActionAffordance.json @@ -8,12 +8,12 @@ "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "action_element": { "type": "object", "if": { @@ -41,10 +41,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -55,7 +55,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -81,12 +81,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -111,7 +111,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-title--DataSchema.json b/packages/assertions/assertions-td/td-vocab-title--DataSchema.json index 71a9ddc3d..5fa80035e 100644 --- a/packages/assertions/assertions-td/td-vocab-title--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-title--DataSchema.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["title"], "properties": { "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -105,7 +105,7 @@ "required": ["title"], "properties": { "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -115,16 +115,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -135,7 +135,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -161,12 +161,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -189,7 +189,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-title--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-title--InteractionAffordance.json index 2887c1436..ca5563428 100644 --- a/packages/assertions/assertions-td/td-vocab-title--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-title--InteractionAffordance.json @@ -8,31 +8,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["title"], "properties": { "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -46,7 +46,7 @@ "required": ["title"], "properties": { "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, @@ -60,7 +60,7 @@ "required": ["title"], "properties": { "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-titles--DataSchema.json b/packages/assertions/assertions-td/td-vocab-titles--DataSchema.json index 2a96cf205..52616782b 100644 --- a/packages/assertions/assertions-td/td-vocab-titles--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-titles--DataSchema.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["titles"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } } }, @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -105,7 +105,7 @@ "required": ["titles"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } } }, @@ -115,16 +115,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -135,7 +135,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -161,12 +161,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -189,7 +189,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-titles--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-titles--InteractionAffordance.json index 98120f41e..5c67ff8df 100644 --- a/packages/assertions/assertions-td/td-vocab-titles--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-titles--InteractionAffordance.json @@ -9,31 +9,31 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { "required": ["titles"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } } }, @@ -47,7 +47,7 @@ "required": ["titles"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } } }, @@ -61,7 +61,7 @@ "required": ["titles"], "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } } }, diff --git a/packages/assertions/assertions-td/td-vocab-titles--Thing.json b/packages/assertions/assertions-td/td-vocab-titles--Thing.json index 11e0cb822..c07be5384 100644 --- a/packages/assertions/assertions-td/td-vocab-titles--Thing.json +++ b/packages/assertions/assertions-td/td-vocab-titles--Thing.json @@ -7,11 +7,11 @@ "type": "object", "properties": { "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" } }, "required": ["titles"], - "$defs": { + "definitions": { "titles": { "type": "object", "additionalProperties": { diff --git a/packages/assertions/assertions-td/td-vocab-token--OAuth2SecurityScheme.json b/packages/assertions/assertions-td/td-vocab-token--OAuth2SecurityScheme.json index 33b121b16..3bede6fb1 100644 --- a/packages/assertions/assertions-td/td-vocab-token--OAuth2SecurityScheme.json +++ b/packages/assertions/assertions-td/td-vocab-token--OAuth2SecurityScheme.json @@ -9,7 +9,7 @@ "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } } }, @@ -17,7 +17,7 @@ "securityDefinitions" ], "additionalProperties": true, - "$defs": { + "definitions": { "securityScheme": { "if": { "oneOf": [{ @@ -27,7 +27,7 @@ "type": "string" }, "proxy": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scheme": { "type": "string", @@ -36,13 +36,13 @@ ] }, "authorization": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "token": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "refresh": { - "$ref": "#/$defs/url" + "$ref": "#/definitions/url" }, "scopes": { "type": "array", diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_array.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_array.json index 8c0635a1e..61606b2fb 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_array.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_array.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_boolean.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_boolean.json index 8395606c3..82cd33f51 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_boolean.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_boolean.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_integer.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_integer.json index 2c967a562..667efab6e 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_integer.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_integer.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_null.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_null.json index c5a1543d6..b6161d096 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_null.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_null.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_number.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_number.json index 0200e27ff..5bb7116f3 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_number.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_number.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_object.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_object.json index 8e5f9cb91..6f8fea8c1 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_object.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_object.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--DataSchema_string.json b/packages/assertions/assertions-td/td-vocab-type--DataSchema_string.json index 6f1d811a8..f26b7fe45 100644 --- a/packages/assertions/assertions-td/td-vocab-type--DataSchema_string.json +++ b/packages/assertions/assertions-td/td-vocab-type--DataSchema_string.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -48,30 +48,30 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -81,10 +81,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -92,13 +92,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -121,16 +121,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -141,7 +141,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -167,12 +167,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -197,7 +197,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-type--Link.json b/packages/assertions/assertions-td/td-vocab-type--Link.json index 0af8aa637..c7e6216a0 100644 --- a/packages/assertions/assertions-td/td-vocab-type--Link.json +++ b/packages/assertions/assertions-td/td-vocab-type--Link.json @@ -8,12 +8,12 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-td/td-vocab-unit--DataSchema.json b/packages/assertions/assertions-td/td-vocab-unit--DataSchema.json index 81f7701d1..db79e94a1 100644 --- a/packages/assertions/assertions-td/td-vocab-unit--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-unit--DataSchema.json @@ -9,25 +9,25 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -45,29 +45,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -79,10 +79,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -90,13 +90,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -116,16 +116,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -136,7 +136,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -162,12 +162,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -192,7 +192,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-uriVariables--InteractionAffordance.json b/packages/assertions/assertions-td/td-vocab-uriVariables--InteractionAffordance.json index 9e638e8f0..442aeb7d8 100644 --- a/packages/assertions/assertions-td/td-vocab-uriVariables--InteractionAffordance.json +++ b/packages/assertions/assertions-td/td-vocab-uriVariables--InteractionAffordance.json @@ -9,25 +9,25 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -36,7 +36,7 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -53,7 +53,7 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -70,7 +70,7 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } } @@ -89,10 +89,10 @@ "type": "string" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -103,7 +103,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -129,12 +129,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -159,7 +159,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-td/td-vocab-writeOnly--DataSchema.json b/packages/assertions/assertions-td/td-vocab-writeOnly--DataSchema.json index 203b36146..3aa0ef0c6 100644 --- a/packages/assertions/assertions-td/td-vocab-writeOnly--DataSchema.json +++ b/packages/assertions/assertions-td/td-vocab-writeOnly--DataSchema.json @@ -9,24 +9,24 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "property_element": { "type": "object", "if": { @@ -44,29 +44,29 @@ "properties": { "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -78,10 +78,10 @@ "type": "object", "properties": { "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -89,13 +89,13 @@ "type": "object", "properties": { "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } }, @@ -115,16 +115,16 @@ "else": { "properties": { "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -135,7 +135,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -161,12 +161,12 @@ }, "items": { "oneOf": [{ - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -189,7 +189,7 @@ }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { diff --git a/packages/assertions/assertions-tm/tm-compose-instanceName.json b/packages/assertions/assertions-tm/tm-compose-instanceName.json index 2f0efb4e3..c48d4482d 100644 --- a/packages/assertions/assertions-tm/tm-compose-instanceName.json +++ b/packages/assertions/assertions-tm/tm-compose-instanceName.json @@ -8,12 +8,12 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-tm/tm-compose-submodel.json b/packages/assertions/assertions-tm/tm-compose-submodel.json index e4a6921da..104cae633 100644 --- a/packages/assertions/assertions-tm/tm-compose-submodel.json +++ b/packages/assertions/assertions-tm/tm-compose-submodel.json @@ -8,12 +8,12 @@ "links": { "type": "array", "items": { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" } } }, "additionalProperties": true, - "$defs": { + "definitions": { "link_element": { "if": { "type": "object", diff --git a/packages/assertions/assertions-tm/tm-extend.json b/packages/assertions/assertions-tm/tm-extend.json index a0231abd6..8e09442d3 100644 --- a/packages/assertions/assertions-tm/tm-extend.json +++ b/packages/assertions/assertions-tm/tm-extend.json @@ -9,10 +9,10 @@ "type": "array", "items": { "if":{ - "$ref": "#/$defs/tm_extend_link_element" + "$ref": "#/definitions/tm_extend_link_element" }, "else":{ - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, "then":{ "const": "tm-extend=pass" @@ -22,7 +22,7 @@ } }, "additionalProperties": true, - "$defs": { + "definitions": { "anyUri": { "type": "string" }, @@ -30,7 +30,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "type": { "type": "string" @@ -39,7 +39,7 @@ "type": "string" }, "anchor": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" } }, "required": [ @@ -50,7 +50,7 @@ "tm_extend_link_element":{ "allOf": [ { - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, { "properties": { diff --git a/packages/assertions/assertions-tm/tm-identification.json b/packages/assertions/assertions-tm/tm-identification.json index 24d3b4269..1aee76618 100644 --- a/packages/assertions/assertions-tm/tm-identification.json +++ b/packages/assertions/assertions-tm/tm-identification.json @@ -8,7 +8,7 @@ "@type": { "anyOf": [ { - "$ref":"#/$defs/tm_string" + "$ref":"#/definitions/tm_string" }, { "type": "array", @@ -16,7 +16,7 @@ "type": "string" }, "contains": { - "$ref":"#/$defs/tm_string" + "$ref":"#/definitions/tm_string" } } ] @@ -26,7 +26,7 @@ "@type" ], "additionalProperties": true, - "$defs": { + "definitions": { "tm_string": { "type": "string", "const": "tm:ThingModel" diff --git a/packages/assertions/assertions-tm/tm-protocol-security-restriction.json b/packages/assertions/assertions-tm/tm-protocol-security-restriction.json index 4f7cdd887..f0505703a 100644 --- a/packages/assertions/assertions-tm/tm-protocol-security-restriction.json +++ b/packages/assertions/assertions-tm/tm-protocol-security-restriction.json @@ -3,7 +3,7 @@ "description": "A Thing Model MAY NOT contain instance specific Protocol Binding and security information such as endpoint addresses.", "$schema ": "http://json-schema.org/draft/2019-09/schema#", "is-complex":true, - "$defs": { + "definitions": { "anyUri": { "type": "string" }, @@ -83,10 +83,10 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "security": { - "$ref": "#/$defs/security" + "$ref": "#/definitions/security" } }, "required": [ @@ -97,21 +97,21 @@ "form_element_property": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ] }, "form_element_action": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ] }, "form_element_event": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object" @@ -119,7 +119,7 @@ "form_element_root": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object", @@ -165,16 +165,16 @@ "$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", "oneOf": [ { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" }, { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" }, { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" }, { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } ] }, @@ -185,7 +185,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" } } }, @@ -200,7 +200,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" } } }, @@ -216,7 +216,7 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" } } }, @@ -390,34 +390,34 @@ "securityScheme": { "oneOf": [ { - "$ref": "#/$defs/noSecurityScheme" + "$ref": "#/definitions/noSecurityScheme" }, { - "$ref": "#/$defs/autoSecurityScheme" + "$ref": "#/definitions/autoSecurityScheme" }, { - "$ref": "#/$defs/comboSecurityScheme" + "$ref": "#/definitions/comboSecurityScheme" }, { - "$ref": "#/$defs/basicSecurityScheme" + "$ref": "#/definitions/basicSecurityScheme" }, { - "$ref": "#/$defs/digestSecurityScheme" + "$ref": "#/definitions/digestSecurityScheme" }, { - "$ref": "#/$defs/apiKeySecurityScheme" + "$ref": "#/definitions/apiKeySecurityScheme" }, { - "$ref": "#/$defs/bearerSecurityScheme" + "$ref": "#/definitions/bearerSecurityScheme" }, { - "$ref": "#/$defs/pskSecurityScheme" + "$ref": "#/definitions/pskSecurityScheme" }, { - "$ref": "#/$defs/oAuth2SecurityScheme" + "$ref": "#/definitions/oAuth2SecurityScheme" }, { - "$ref": "#/$defs/additionalSecurityScheme" + "$ref": "#/definitions/additionalSecurityScheme" } ] } @@ -428,36 +428,36 @@ "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } }, "base": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "securityDefinitions": { "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } }, "security": { diff --git a/packages/assertions/assertions-tm/tm-tmOptional.json b/packages/assertions/assertions-tm/tm-tmOptional.json index e40e7d541..fc97766a0 100644 --- a/packages/assertions/assertions-tm/tm-tmOptional.json +++ b/packages/assertions/assertions-tm/tm-tmOptional.json @@ -9,7 +9,7 @@ "tm:optional": { "type": "array", "items": { - "$ref": "#/$defs/JSONPointer" + "$ref": "#/definitions/JSONPointer" } } }, @@ -17,7 +17,7 @@ "tm:optional" ], "additionalProperties": true, - "$defs": { + "definitions": { "JSONPointer": { "type": "string", "format": "uri-reference" diff --git a/packages/assertions/assertions-tm/tm-tmRef1.json b/packages/assertions/assertions-tm/tm-tmRef1.json index 471ddb308..5642d70c1 100644 --- a/packages/assertions/assertions-tm/tm-tmRef1.json +++ b/packages/assertions/assertions-tm/tm-tmRef1.json @@ -7,14 +7,14 @@ "type": "object", "properties": { "tm:ref": { - "$ref": "#/$defs/tm_ref" + "$ref": "#/definitions/tm_ref" } }, "required": [ "tm:ref" ], "additionalProperties": true, - "$defs": { + "definitions": { "tm_ref": { "type": "string", "pattern": "^([a-zA-Z][a-zA-Z0-9+\\-.]*:[^\\s]*)(#(?:\/(?:[a-zA-Z0-9_\\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*)$" diff --git a/packages/core/td-schema-full.json b/packages/core/td-schema-full.json index 40f39eeec..0bacf2e0e 100644 --- a/packages/core/td-schema-full.json +++ b/packages/core/td-schema-full.json @@ -3,7 +3,7 @@ "version": "1.1-10-June-2022", "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", "$schema": "http://json-schema.org/draft-07/schema#", - "$defs": { + "definitions": { "anyUri": { "type": "string" }, @@ -74,46 +74,46 @@ "type": "array", "items": [ { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" } ], "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" } ], "not": { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } } }, { "$comment": "Only the new context URI", - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" }, { "$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", "type": "array", "prefixItems": [ { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" }, { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" } ], "minItems": 2, "contains": { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" }, "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -126,17 +126,17 @@ "type": "array", "prefixItems": [ { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } ], "minItems": 1, "contains": { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" }, "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -146,7 +146,7 @@ }, { "$comment": "Only the new context URI", - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } ] }, @@ -185,19 +185,19 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -208,7 +208,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -231,17 +231,17 @@ "type": "string" }, "type": { - "$ref": "#/$defs/dataSchema-type" + "$ref": "#/definitions/dataSchema-type" }, "items": { "oneOf": [ { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -275,11 +275,11 @@ "minimum": 0 }, "multipleOf": { - "$ref": "#/$defs/multipleOfDefinition" + "$ref": "#/definitions/multipleOfDefinition" }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { @@ -338,7 +338,7 @@ ] }, "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "contentType": { "type": "string" @@ -347,19 +347,19 @@ "type": "string" }, "subprotocol": { - "$ref": "#/$defs/subprotocol" + "$ref": "#/definitions/subprotocol" }, "security": { - "$ref": "#/$defs/security" + "$ref": "#/definitions/security" }, "scopes": { - "$ref": "#/$defs/scopes" + "$ref": "#/definitions/scopes" }, "response": { - "$ref": "#/$defs/expectedResponse" + "$ref": "#/definitions/expectedResponse" }, "additionalResponses": { - "$ref": "#/$defs/additionalResponsesDefinition" + "$ref": "#/definitions/additionalResponsesDefinition" } }, "required": ["href", "contentType", "op"], @@ -368,7 +368,7 @@ "form_element_property": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object", @@ -404,7 +404,7 @@ "form_element_action": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object", @@ -430,7 +430,7 @@ "form_element_event": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object", @@ -456,7 +456,7 @@ "form_element_root": { "allOf": [ { - "$ref": "#/$defs/form_element_base" + "$ref": "#/definitions/form_element_base" } ], "type": "object", @@ -503,16 +503,16 @@ "$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", "oneOf": [ { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" }, { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" }, { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" }, { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } ] }, @@ -520,31 +520,31 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "observable": { @@ -559,7 +559,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -576,17 +576,17 @@ "const": {}, "default": {}, "type": { - "$ref": "#/$defs/dataSchema-type" + "$ref": "#/definitions/dataSchema-type" }, "items": { "oneOf": [ { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -620,11 +620,11 @@ "minimum": 0 }, "multipleOf": { - "$ref": "#/$defs/multipleOfDefinition" + "$ref": "#/definitions/multipleOfDefinition" }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { @@ -641,38 +641,38 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "safe": { "type": "boolean" @@ -691,44 +691,44 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "dataResponse": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": ["forms"], @@ -738,7 +738,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "type": { "type": "string" @@ -747,7 +747,7 @@ "type": "string" }, "anchor": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" } }, "required": ["href"], @@ -756,7 +756,7 @@ "link_element": { "allOf": [ { - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, { "not": { @@ -784,7 +784,7 @@ "icon_link_element": { "allOf": [ { - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, { "properties": { @@ -815,16 +815,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -837,16 +837,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -859,16 +859,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -883,16 +883,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -912,16 +912,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -943,16 +943,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -972,16 +972,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1005,16 +1005,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1041,23 +1041,23 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", "enum": ["bearer"] }, "authorization": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "alg": { "type": "string" @@ -1079,16 +1079,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1104,29 +1104,29 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", "enum": ["oauth2"] }, "authorization": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "token": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "refresh": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scopes": { "oneOf": [ @@ -1158,34 +1158,34 @@ "securityScheme": { "oneOf": [ { - "$ref": "#/$defs/noSecurityScheme" + "$ref": "#/definitions/noSecurityScheme" }, { - "$ref": "#/$defs/autoSecurityScheme" + "$ref": "#/definitions/autoSecurityScheme" }, { - "$ref": "#/$defs/comboSecurityScheme" + "$ref": "#/definitions/comboSecurityScheme" }, { - "$ref": "#/$defs/basicSecurityScheme" + "$ref": "#/definitions/basicSecurityScheme" }, { - "$ref": "#/$defs/digestSecurityScheme" + "$ref": "#/definitions/digestSecurityScheme" }, { - "$ref": "#/$defs/apiKeySecurityScheme" + "$ref": "#/definitions/apiKeySecurityScheme" }, { - "$ref": "#/$defs/bearerSecurityScheme" + "$ref": "#/definitions/bearerSecurityScheme" }, { - "$ref": "#/$defs/pskSecurityScheme" + "$ref": "#/definitions/pskSecurityScheme" }, { - "$ref": "#/$defs/oAuth2SecurityScheme" + "$ref": "#/definitions/oAuth2SecurityScheme" }, { - "$ref": "#/$defs/additionalSecurityScheme" + "$ref": "#/definitions/additionalSecurityScheme" } ] } @@ -1197,34 +1197,34 @@ "format": "uri" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "version": { "type": "object", @@ -1240,10 +1240,10 @@ "items": { "oneOf": [ { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" }, { - "$ref": "#/$defs/icon_link_element" + "$ref": "#/definitions/icon_link_element" } ] } @@ -1252,28 +1252,28 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } }, "base": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "securityDefinitions": { "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } }, "schemaDefinitions": { "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "support": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "created": { "type": "string", @@ -1286,13 +1286,13 @@ "profile": { "oneOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" } } ] @@ -1314,14 +1314,14 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "@context": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" } }, "required": ["title", "security", "securityDefinitions", "@context"], diff --git a/packages/core/td-schema.json b/packages/core/td-schema.json index c05c193a8..7dff2d8b3 100644 --- a/packages/core/td-schema.json +++ b/packages/core/td-schema.json @@ -4,7 +4,7 @@ "description": "JSON Schema for validating TD instances against the TD information model. TD instances can be with or without terms that have default values", "$schema ": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/w3c/wot-thing-description/main/validation/td-json-schema-validation.json", - "$defs": { + "definitions": { "anyUri": { "type": "string" }, @@ -75,46 +75,46 @@ "type": "array", "items": [ { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" } ], "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" } ], "not": { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } } }, { "$comment": "Only the new context URI", - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" }, { "$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", "type": "array", "prefixItems": [ { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" }, { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" } ], "minItems": 2, "contains": { - "$ref": "#/$defs/thing-context-td-uri-v1.1" + "$ref": "#/definitions/thing-context-td-uri-v1.1" }, "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -127,17 +127,17 @@ "type": "array", "prefixItems": [ { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } ], "minItems": 1, "contains": { - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" }, "additionalItems": { "anyOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "object" @@ -147,7 +147,7 @@ }, { "$comment": "Only the new context URI", - "$ref": "#/$defs/thing-context-td-uri-v1" + "$ref": "#/definitions/thing-context-td-uri-v1" } ] }, @@ -190,19 +190,19 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "writeOnly": { "type": "boolean" @@ -213,7 +213,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -236,17 +236,17 @@ "type": "string" }, "type": { - "$ref": "#/$defs/dataSchema-type" + "$ref": "#/definitions/dataSchema-type" }, "items": { "oneOf": [ { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -280,11 +280,11 @@ "minimum": 0 }, "multipleOf": { - "$ref": "#/$defs/multipleOfDefinition" + "$ref": "#/definitions/multipleOfDefinition" }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { @@ -341,7 +341,7 @@ ] }, "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "contentType": { "type": "string" @@ -350,26 +350,26 @@ "type": "string" }, "subprotocol": { - "$ref": "#/$defs/subprotocol" + "$ref": "#/definitions/subprotocol" }, "security": { - "$ref": "#/$defs/security" + "$ref": "#/definitions/security" }, "scopes": { - "$ref": "#/$defs/scopes" + "$ref": "#/definitions/scopes" }, "response": { - "$ref": "#/$defs/expectedResponse" + "$ref": "#/definitions/expectedResponse" }, "additionalResponses": { - "$ref": "#/$defs/additionalResponsesDefinition" + "$ref": "#/definitions/additionalResponsesDefinition" } }, "required": ["href"], "additionalProperties": true }, "form_element_property": { - "allOf": [{ "$ref": "#/$defs/form_element_base" }], + "allOf": [{ "$ref": "#/definitions/form_element_base" }], "type": "object", "properties": { "op": { @@ -401,7 +401,7 @@ "additionalProperties": true }, "form_element_action": { - "allOf": [{ "$ref": "#/$defs/form_element_base" }], + "allOf": [{ "$ref": "#/definitions/form_element_base" }], "type": "object", "properties": { "op": { @@ -423,7 +423,7 @@ "additionalProperties": true }, "form_element_event": { - "allOf": [{ "$ref": "#/$defs/form_element_base" }], + "allOf": [{ "$ref": "#/definitions/form_element_base" }], "type": "object", "properties": { "op": { @@ -445,7 +445,7 @@ "additionalProperties": true }, "form_element_root": { - "allOf": [{ "$ref": "#/$defs/form_element_base" }], + "allOf": [{ "$ref": "#/definitions/form_element_base" }], "type": "object", "properties": { "op": { @@ -490,41 +490,41 @@ "form": { "$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", "oneOf": [ - { "$ref": "#/$defs/form_element_property" }, - { "$ref": "#/$defs/form_element_action" }, - { "$ref": "#/$defs/form_element_event" }, - { "$ref": "#/$defs/form_element_root" } + { "$ref": "#/definitions/form_element_property" }, + { "$ref": "#/definitions/form_element_action" }, + { "$ref": "#/definitions/form_element_event" }, + { "$ref": "#/definitions/form_element_root" } ] }, "property_element": { "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_property" + "$ref": "#/definitions/form_element_property" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "observable": { @@ -539,7 +539,7 @@ "oneOf": { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "unit": { @@ -556,17 +556,17 @@ "const": {}, "default": {}, "type": { - "$ref": "#/$defs/dataSchema-type" + "$ref": "#/definitions/dataSchema-type" }, "items": { "oneOf": [ { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, { "type": "array", "items": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } } ] @@ -600,11 +600,11 @@ "minimum": 0 }, "multipleOf": { - "$ref": "#/$defs/multipleOfDefinition" + "$ref": "#/definitions/multipleOfDefinition" }, "properties": { "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": { @@ -621,38 +621,38 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_action" + "$ref": "#/definitions/form_element_action" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "input": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "output": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "safe": { "type": "boolean" @@ -671,44 +671,44 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "forms": { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_event" + "$ref": "#/definitions/form_element_event" } }, "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "subscription": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "data": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "dataResponse": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" }, "cancellation": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "required": ["forms"], @@ -718,7 +718,7 @@ "type": "object", "properties": { "href": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "type": { "type": "string" @@ -727,15 +727,15 @@ "type": "string" }, "anchor": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "hreflang": { "anyOf": [ - { "$ref": "#/$defs/bcp47_string" }, + { "$ref": "#/definitions/bcp47_string" }, { "type": "array", "items": { - "$ref": "#/$defs/bcp47_string" + "$ref": "#/definitions/bcp47_string" } } ] @@ -747,7 +747,7 @@ "link_element": { "allOf": [ { - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, { "not": { @@ -775,7 +775,7 @@ "icon_link_element": { "allOf": [ { - "$ref": "#/$defs/base_link_element" + "$ref": "#/definitions/base_link_element" }, { "properties": { @@ -806,16 +806,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -829,16 +829,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -852,16 +852,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -880,16 +880,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -910,16 +910,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -942,16 +942,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -972,16 +972,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1006,16 +1006,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1036,23 +1036,23 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", "enum": ["bearer"] }, "authorization": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "alg": { "type": "string" @@ -1075,16 +1075,16 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", @@ -1101,29 +1101,29 @@ "type": "object", "properties": { "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "proxy": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scheme": { "type": "string", "enum": ["oauth2"] }, "authorization": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "token": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "refresh": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "scopes": { "oneOf": [ @@ -1156,34 +1156,34 @@ "securityScheme": { "oneOf": [ { - "$ref": "#/$defs/noSecurityScheme" + "$ref": "#/definitions/noSecurityScheme" }, { - "$ref": "#/$defs/autoSecurityScheme" + "$ref": "#/definitions/autoSecurityScheme" }, { - "$ref": "#/$defs/comboSecurityScheme" + "$ref": "#/definitions/comboSecurityScheme" }, { - "$ref": "#/$defs/basicSecurityScheme" + "$ref": "#/definitions/basicSecurityScheme" }, { - "$ref": "#/$defs/digestSecurityScheme" + "$ref": "#/definitions/digestSecurityScheme" }, { - "$ref": "#/$defs/apiKeySecurityScheme" + "$ref": "#/definitions/apiKeySecurityScheme" }, { - "$ref": "#/$defs/bearerSecurityScheme" + "$ref": "#/definitions/bearerSecurityScheme" }, { - "$ref": "#/$defs/pskSecurityScheme" + "$ref": "#/definitions/pskSecurityScheme" }, { - "$ref": "#/$defs/oAuth2SecurityScheme" + "$ref": "#/definitions/oAuth2SecurityScheme" }, { - "$ref": "#/$defs/additionalSecurityScheme" + "$ref": "#/definitions/additionalSecurityScheme" } ] } @@ -1195,34 +1195,34 @@ "format": "uri" }, "title": { - "$ref": "#/$defs/title" + "$ref": "#/definitions/title" }, "titles": { - "$ref": "#/$defs/titles" + "$ref": "#/definitions/titles" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/property_element" + "$ref": "#/definitions/property_element" } }, "actions": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/action_element" + "$ref": "#/definitions/action_element" } }, "events": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/event_element" + "$ref": "#/definitions/event_element" } }, "description": { - "$ref": "#/$defs/description" + "$ref": "#/definitions/description" }, "descriptions": { - "$ref": "#/$defs/descriptions" + "$ref": "#/definitions/descriptions" }, "version": { "type": "object", @@ -1238,10 +1238,10 @@ "items": { "oneOf": [ { - "$ref": "#/$defs/link_element" + "$ref": "#/definitions/link_element" }, { - "$ref": "#/$defs/icon_link_element" + "$ref": "#/definitions/icon_link_element" } ] } @@ -1250,28 +1250,28 @@ "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/form_element_root" + "$ref": "#/definitions/form_element_root" } }, "base": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "securityDefinitions": { "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/securityScheme" + "$ref": "#/definitions/securityScheme" } }, "schemaDefinitions": { "type": "object", "minProperties": 1, "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "support": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, "created": { "type": "string", @@ -1284,13 +1284,13 @@ "profile": { "oneOf": [ { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" }, { "type": "array", "minItems": 1, "items": { - "$ref": "#/$defs/anyUri" + "$ref": "#/definitions/anyUri" } } ] @@ -1312,14 +1312,14 @@ "uriVariables": { "type": "object", "additionalProperties": { - "$ref": "#/$defs/dataSchema" + "$ref": "#/definitions/dataSchema" } }, "@type": { - "$ref": "#/$defs/type_declaration" + "$ref": "#/definitions/type_declaration" }, "@context": { - "$ref": "#/$defs/thing-context" + "$ref": "#/definitions/thing-context" } }, "required": ["title", "security", "securityDefinitions", "@context"], From 2b2af713e55228b3fe698d096b0a2e66dddad6a8 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 16:49:33 +0200 Subject: [PATCH 04/28] sync to td schemas and format --- packages/core/td-schema.json | 11 +- packages/core/tm-schema.json | 196 ++++++++++++++--------------------- 2 files changed, 81 insertions(+), 126 deletions(-) diff --git a/packages/core/td-schema.json b/packages/core/td-schema.json index 7dff2d8b3..22c1a2768 100644 --- a/packages/core/td-schema.json +++ b/packages/core/td-schema.json @@ -1,8 +1,8 @@ { "title": "Thing Description", - "version": "1.1-10-June-2022", + "version": "1.1-05-September-2022", "description": "JSON Schema for validating TD instances against the TD information model. TD instances can be with or without terms that have default values", - "$schema ": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://raw.githubusercontent.com/w3c/wot-thing-description/main/validation/td-json-schema-validation.json", "definitions": { "anyUri": { @@ -32,7 +32,8 @@ "type": "array", "items": { "type": "string" - } + }, + "minItems": 1 }, { "type": "string" @@ -868,8 +869,8 @@ "enum": ["auto"] } }, - "not":{ - "required":["name"] + "not": { + "required": ["name"] }, "required": ["scheme"], "additionalProperties": true diff --git a/packages/core/tm-schema.json b/packages/core/tm-schema.json index f4fecb080..c83b0c3da 100644 --- a/packages/core/tm-schema.json +++ b/packages/core/tm-schema.json @@ -1,8 +1,9 @@ { "title": "Thing Model", - "version": "1.1-10-June-2022", + "version": "1.1-05-September-2022", "description": "JSON Schema for validating Thing Models. This is automatically generated from the WoT TD Schema.", - "$schema ": "http://json-schema.org/draft-07/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://raw.githubusercontent.com/w3c/wot-thing-description/main/validation/tm-json-schema-validation.json", "definitions": { "anyUri": { "type": "string" @@ -63,11 +64,7 @@ }, "subprotocol": { "type": "string", - "examples": [ - "longpoll", - "websub", - "sse" - ] + "examples": ["longpoll", "websub", "sse"] }, "thing-context-td-uri-v1": { "type": "string", @@ -164,6 +161,10 @@ } ] }, + "bcp47_string": { + "type": "string", + "pattern": "^(((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+)|((en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)))$" + }, "type_declaration": { "oneOf": [ { @@ -403,10 +404,7 @@ "multipleOfDefinition": { "anyOf": [ { - "type": [ - "integer", - "number" - ], + "type": ["integer", "number"], "exclusiveMinimum": 0 }, { @@ -547,11 +545,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "invokeaction", - "queryaction", - "cancelaction" - ] + "enum": ["invokeaction", "queryaction", "cancelaction"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -564,11 +558,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "invokeaction", - "queryaction", - "cancelaction" - ] + "enum": ["invokeaction", "queryaction", "cancelaction"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -603,10 +593,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "subscribeevent", - "unsubscribeevent" - ] + "enum": ["subscribeevent", "unsubscribeevent"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -619,10 +606,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "subscribeevent", - "unsubscribeevent" - ] + "enum": ["subscribeevent", "unsubscribeevent"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1095,6 +1079,19 @@ "anchor": { "$ref": "#/definitions/anyUri" }, + "hreflang": { + "anyOf": [ + { + "$ref": "#/definitions/bcp47_string" + }, + { + "type": "array", + "items": { + "$ref": "#/definitions/bcp47_string" + } + } + ] + }, "instanceName": { "type": "string" } @@ -1118,9 +1115,7 @@ "properties": { "sizes": {} }, - "required": [ - "sizes" - ] + "required": ["sizes"] } }, { @@ -1130,9 +1125,7 @@ "rel": { "anyOf": [ { - "enum": [ - "icon" - ] + "enum": ["icon"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1140,9 +1133,7 @@ ] } }, - "required": [ - "rel" - ] + "required": ["rel"] } } ] @@ -1162,9 +1153,7 @@ "pattern": "[0-9]*x[0-9]+" } }, - "required": [ - "rel" - ] + "required": ["rel"] } ] }, @@ -1176,10 +1165,7 @@ "scheme": "ace:ACESecurityScheme", "ace:as": "coaps://as.example.com/token", "ace:audience": "coaps://rs.example.com", - "ace:scopes": [ - "limited", - "special" - ], + "ace:scopes": ["limited", "special"], "ace:cnonce": true } ], @@ -1202,6 +1188,7 @@ "pattern": ".+:.*" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1227,9 +1214,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "nosec" - ] + "enum": ["nosec"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1240,6 +1225,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1265,9 +1251,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "auto" - ] + "enum": ["auto"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1275,6 +1259,10 @@ ] } }, + "not": { + "required": ["name"] + }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1302,9 +1290,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "combo" - ] + "enum": ["combo"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1321,7 +1307,8 @@ "tm:ref": { "$ref": "#/definitions/tm_ref" } - } + }, + "additionalProperties": true }, { "type": "object", @@ -1342,9 +1329,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "combo" - ] + "enum": ["combo"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1361,7 +1346,8 @@ "tm:ref": { "$ref": "#/definitions/tm_ref" } - } + }, + "additionalProperties": true } ] }, @@ -1384,9 +1370,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "basic" - ] + "enum": ["basic"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1397,13 +1381,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "header", - "query", - "body", - "cookie", - "auto" - ] + "enum": ["header", "query", "body", "cookie", "auto"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1417,6 +1395,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1442,9 +1421,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "digest" - ] + "enum": ["digest"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1455,10 +1432,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "auth", - "auth-int" - ] + "enum": ["auth", "auth-int"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1469,13 +1443,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "header", - "query", - "body", - "cookie", - "auto" - ] + "enum": ["header", "query", "body", "cookie", "auto"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1489,6 +1457,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1514,9 +1483,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "apikey" - ] + "enum": ["apikey"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1527,14 +1494,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "header", - "query", - "body", - "cookie", - "uri", - "auto" - ] + "enum": ["header", "query", "body", "cookie", "uri", "auto"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1548,6 +1508,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1573,9 +1534,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "bearer" - ] + "enum": ["bearer"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1595,13 +1554,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "header", - "query", - "body", - "cookie", - "auto" - ] + "enum": ["header", "query", "body", "cookie", "auto"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1615,6 +1568,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1640,9 +1594,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "psk" - ] + "enum": ["psk"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1656,6 +1608,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1681,9 +1634,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "oauth2" - ] + "enum": ["oauth2"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1721,11 +1672,7 @@ "type": "string", "anyOf": [ { - "enum": [ - "code", - "client", - "device" - ] + "enum": ["code", "client", "device"] }, { "$ref": "#/definitions/placeholder-pattern" @@ -1738,6 +1685,7 @@ "$ref": "#/definitions/tm_ref" } }, + "additionalProperties": true, "propertyNames": { "not": { "$ref": "#/definitions/placeholder-pattern" @@ -1866,7 +1814,7 @@ { "type": "object", "properties": { - "instance": { + "model": { "type": "string" } }, @@ -1874,6 +1822,15 @@ "not": { "$ref": "#/definitions/placeholder-pattern" } + }, + "not": { + "type": "object", + "properties": { + "instance": { + "type": "string" + } + }, + "required": ["instance"] } }, { @@ -1992,8 +1949,5 @@ "$ref": "#/definitions/placeholder-pattern" } }, - "required": [ - "@context", - "@type" - ] -} \ No newline at end of file + "required": ["@context", "@type"] +} From 170f9f463a5b77b186199d664e757afd93d32bb2 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 17:19:55 +0200 Subject: [PATCH 05/28] add tm-versioning-2 related files --- .../assertions-tm/tm-versioning-2.json | 36 +++++++++++++++++++ .../assertions-tm/tmAssertionList.json | 2 +- packages/core/examples/tms/valid/version.json | 7 ++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 packages/assertions/assertions-tm/tm-versioning-2.json create mode 100644 packages/core/examples/tms/valid/version.json diff --git a/packages/assertions/assertions-tm/tm-versioning-2.json b/packages/assertions/assertions-tm/tm-versioning-2.json new file mode 100644 index 000000000..02c7473e7 --- /dev/null +++ b/packages/assertions/assertions-tm/tm-versioning-2.json @@ -0,0 +1,36 @@ +{ + "title": "tm-versioning-2", + "description": "Due to the definition of Thing Model the term instance MUST be omitted within the version container.", + "$schema ": "https://json-schema.org/draft/2019-09/schema#", + "is-complex":false, + "type": "object", + "properties": { + "version": { + "anyOf": [ + { + "type": "object", + "properties": { + "model": { + "type": "string" + } + }, + "not": { + "type": "object", + "properties": { + "instance": { + "type": "string" + } + }, + "required": [ + "instance" + ] + } + } + ] + } + }, + "required": [ + "version" + ], + "additionalProperties": true +} \ No newline at end of file diff --git a/packages/assertions/assertions-tm/tmAssertionList.json b/packages/assertions/assertions-tm/tmAssertionList.json index 291647b53..72058701e 100644 --- a/packages/assertions/assertions-tm/tmAssertionList.json +++ b/packages/assertions/assertions-tm/tmAssertionList.json @@ -1 +1 @@ -["tm-compose-instanceName.json","tm-compose-submodel.json","tm-extend.json","tm-identification.json","tm-placeholder.json","tm-protocol-security-restriction.json","tm-tmOptional.json","tm-tmRef1.json"] \ No newline at end of file +["tm-compose-instanceName.json","tm-compose-submodel.json","tm-extend.json","tm-identification.json","tm-placeholder.json","tm-protocol-security-restriction.json","tm-tmOptional.json","tm-tmRef1.json","tm-versioning-2.json"] \ No newline at end of file diff --git a/packages/core/examples/tms/valid/version.json b/packages/core/examples/tms/valid/version.json new file mode 100644 index 000000000..12077db85 --- /dev/null +++ b/packages/core/examples/tms/valid/version.json @@ -0,0 +1,7 @@ +{ + "@context": ["https://www.w3.org/2022/wot/td/v1.1"], + "@type" : "tm:ThingModel", + "title": "Lamp Thing Model", + "description": "Lamp Thing Description Model", + "version" : {"instance" : "1.0.0" } + } \ No newline at end of file From 900f605a6979b71a2de453afffc70ce5f3421041 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 17:21:54 +0200 Subject: [PATCH 06/28] fix example --- packages/core/examples/tms/valid/version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/examples/tms/valid/version.json b/packages/core/examples/tms/valid/version.json index 12077db85..58d472af1 100644 --- a/packages/core/examples/tms/valid/version.json +++ b/packages/core/examples/tms/valid/version.json @@ -1,7 +1,7 @@ { "@context": ["https://www.w3.org/2022/wot/td/v1.1"], "@type" : "tm:ThingModel", - "title": "Lamp Thing Model", - "description": "Lamp Thing Description Model", - "version" : {"instance" : "1.0.0" } + "title": "Lamp Thing Model", + "description": "Lamp Thing Description Model", + "version" : {"model" : "1.0.0" } } \ No newline at end of file From dbe5f0d70c7b312eec30e61f51af310a2027c5ea Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 21:16:45 +0200 Subject: [PATCH 07/28] add tm optional check --- packages/core/tm-schema.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/core/tm-schema.json b/packages/core/tm-schema.json index c83b0c3da..03adedeb8 100644 --- a/packages/core/tm-schema.json +++ b/packages/core/tm-schema.json @@ -1750,8 +1750,21 @@ "tm_optional": { "type": "array", "items": { - "type": "string", - "format": "json-pointer" + "$comment": "this first checks for the general structure of /properties/myProp and then prohibits using / 3 times", + "allOf": [ + { + "type": "string", + "pattern": "^((/properties/)|(/actions/)|(/events/))(([^/]))", + "$comment": "regex tests available at https://regex101.com/r/UgOzrJ/1" + }, + { + "not": { + "type": "string", + "pattern": "(/)(.*\\1){2}", + "$comment": "regex tests available at https://regex101.com/r/Ytzd72/1" + } + } + ] } }, "tm_ref": { From 52baedfd9af85922e606878aab1bd93cd9dec862 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 21:16:55 +0200 Subject: [PATCH 08/28] adjust examples for tm optional check --- .../tms/invalid/optionalWrongLocation.json | 33 +++++++++++++++++++ .../valid/{required.json => optional.json} | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 packages/core/examples/tms/invalid/optionalWrongLocation.json rename packages/core/examples/tms/valid/{required.json => optional.json} (93%) diff --git a/packages/core/examples/tms/invalid/optionalWrongLocation.json b/packages/core/examples/tms/invalid/optionalWrongLocation.json new file mode 100644 index 000000000..ab50c4aba --- /dev/null +++ b/packages/core/examples/tms/invalid/optionalWrongLocation.json @@ -0,0 +1,33 @@ +{ + "id": "urn:required", + "$comment": "example 57 of the spec", + "@context": [ + "https://www.w3.org/2022/wot/td/v1.1" + ], + "@type": "tm:ThingModel", + "title": "Invalid Model due to tmoptional pointing to something else than an interaction affordance", + "description": "Lamp Thing Description Model", + "tm:optional": [ + "#/properties/status/type" + ], + "properties": { + "status": { + "description": "current status of the lamp (on|off)", + "type": "string", + "readOnly": true + } + }, + "actions": { + "toggle": { + "description": "Turn the lamp on or off" + } + }, + "events": { + "overheating": { + "description": "Lamp reaches a critical temperature (overheating)", + "data": { + "type": "string" + } + } + } +} \ No newline at end of file diff --git a/packages/core/examples/tms/valid/required.json b/packages/core/examples/tms/valid/optional.json similarity index 93% rename from packages/core/examples/tms/valid/required.json rename to packages/core/examples/tms/valid/optional.json index 365ffb343..49b54c62d 100644 --- a/packages/core/examples/tms/valid/required.json +++ b/packages/core/examples/tms/valid/optional.json @@ -8,8 +8,8 @@ "title": "Valid Model 11", "description": "Lamp Thing Description Model", "tm:optional": [ - "#/properties/status", - "#/actions/toggle" + "/properties/status", + "/actions/toggle" ], "properties": { "status": { From 936c6480368ead03b9a5196130d6155e285aef53 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 21:30:15 +0200 Subject: [PATCH 09/28] start adding tmoptional check --- packages/core/shared.js | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/core/shared.js b/packages/core/shared.js index 68dc797b5..6af7b6d20 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -704,7 +704,7 @@ function checkLinksRelTypeCount(td){ * all other URI variables declared in the TD. * @param {object} td The TD to do assertion tests */ - function checkUriSecurity(td) { +function checkUriSecurity(td) { const results = [] if (td.hasOwnProperty("securityDefinitions")) { @@ -888,4 +888,25 @@ function checkLinksRelTypeCount(td){ } return results -} \ No newline at end of file +} + +/** + * When tm:optional uses a pointer, it should point to an actual affordance and only to an affordance, as said by + * tm-tmOptional-resolver: The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition. + * JSON Schema checks for the syntax but cannot know if the pointed affordance exists. + * This function checks that programmatically + * @param {object} td The TD to do assertion tests + */ + function checkTmOptionalPointer(td){ + /* + * This function returns part of the object given in param with the value found when resolving the path. Similar to JSON Pointers. + * In case no path is found, the param defaultValue is echoed back + * Taken from + * https://stackoverflow.com/questions/6491463/accessing-nested-javascript-objects-and-arrays-by-string-path/6491621#6491621 + **/ + const resolvePath = (object, path, defaultValue) => path + .split(/[\.\[\]\'\"]/) + .filter(p => p) + .reduce((o, p) => o ? o[p] : defaultValue, object) + + } \ No newline at end of file From 16d668a5de06a8f62cbbcdf820cfda013da3a859 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 21:30:39 +0200 Subject: [PATCH 10/28] fix whitespace --- packages/core/shared.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/shared.js b/packages/core/shared.js index 6af7b6d20..634f23d4a 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -697,10 +697,10 @@ function checkLinksRelTypeCount(td){ /** * When you have apikey security with the key in uri, you put the name of the urivariable in the name field in * securityDefinitions. Ideally, that name appears in href as a uriVariable. See uriSecurity example - * td-security-in-uri-variable: The URIs provided in interactions where a security scheme using uri as the value for + * td-security-in-uri-variable: The URIs provided in interactions where a security scheme using uri as the value for * in MUST be a URI template including the defined variable. * Additionally, this also checks that the uriVariable used in the security does not conflict with ones for the TD - * td-security-uri-variables-distinct: The names of URI variables declared in a SecurityScheme MUST be distinct from + * td-security-uri-variables-distinct: The names of URI variables declared in a SecurityScheme MUST be distinct from * all other URI variables declared in the TD. * @param {object} td The TD to do assertion tests */ @@ -897,7 +897,7 @@ function checkUriSecurity(td) { * This function checks that programmatically * @param {object} td The TD to do assertion tests */ - function checkTmOptionalPointer(td){ +function checkTmOptionalPointer(td){ /* * This function returns part of the object given in param with the value found when resolving the path. Similar to JSON Pointers. * In case no path is found, the param defaultValue is echoed back From e1f53e8cd06c0f89aecb6253b4f9341fa7dc8a30 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Wed, 5 Oct 2022 22:12:27 +0200 Subject: [PATCH 11/28] implement tm optional resolver check --- packages/core/index.js | 24 +++++++----------------- packages/core/shared.js | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/packages/core/index.js b/packages/core/index.js index 3fe1fdf9a..8afd5b70a 100644 --- a/packages/core/index.js +++ b/packages/core/index.js @@ -15,6 +15,8 @@ module.exports.multiLangConsistency = coreAssertions.checkMultiLangConsistency module.exports.checkLinksRelTypeCount = coreAssertions.checkLinksRelTypeCount module.exports.security = coreAssertions.checkSecurity module.exports.checkUriSecurity = coreAssertions.checkUriSecurity +module.exports.checkTmOptionalPointer = coreAssertions.checkTmOptionalPointer + const jsonValidator = require('json-dup-key-validator') @@ -525,7 +527,8 @@ function tdValidator(tdString, logFunc, { checkDefaults=true, checkJsonLd=true } propUniqueness: null, multiLangConsistency: null, linksRelTypeCount: null, - readWriteOnly: null + readWriteOnly: null, + tmOptionalPointer: null } const detailComments = { @@ -534,7 +537,8 @@ function tdValidator(tdString, logFunc, { checkDefaults=true, checkJsonLd=true } propUniqueness: "Checking whether in one interaction pattern there are duplicate names, e.g. two properties called temp.", multiLangConsistency: "Checks whether all titles and descriptions have the same language fields.", linksRelTypeCount: "Checks whether rel:type is used more than once in the links array", - readWriteOnly: "Warns if a property has readOnly or writeOnly set to true conflicting with another property." + readWriteOnly: "Warns if a property has readOnly or writeOnly set to true conflicting with another property.", + tmOptionalPointer: "Checking whether tm:optional points to an actual affordance" } let tmJson @@ -561,21 +565,6 @@ function tdValidator(tdString, logFunc, { checkDefaults=true, checkJsonLd=true } report.schema = "passed" - // ! No need to do defaults checking - // check with full schema - // if (checkDefaults) { - // ajv.addSchema(fullTdSchema, 'fulltd') - // const fullValid = ajv.validate('fulltd', tmJson) - // if (fullValid) { - // report.defaults = "passed" - // } - // else { - // report.defaults = "warning" - // logFunc("Optional validation failed:") - // logFunc("> " + ajv.errorsText(filterErrorMessages(ajv.errors))) - // } - // } - // do additional checks checkEnumConst(tmJson) checkPropItems(tmJson) @@ -591,6 +580,7 @@ function tdValidator(tdString, logFunc, { checkDefaults=true, checkJsonLd=true } } details.multiLangConsistency = evalAssertion(coreAssertions.checkMultiLangConsistency(tmJson)) details.linksRelTypeCount = evalAssertion(coreAssertions.checkLinksRelTypeCount(tmJson)) + details.tmOptionalPointer = evalAssertion(coreAssertions.checkTmOptionalPointer(tmJson)) // determine additional check state // passed + warning -> warning diff --git a/packages/core/shared.js b/packages/core/shared.js index 634f23d4a..6b14615f8 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -17,7 +17,8 @@ module.exports = { checkSecurity, checkMultiLangConsistency, checkLinksRelTypeCount, - checkUriSecurity + checkUriSecurity, + checkTmOptionalPointer } @@ -903,10 +904,40 @@ function checkTmOptionalPointer(td){ * In case no path is found, the param defaultValue is echoed back * Taken from * https://stackoverflow.com/questions/6491463/accessing-nested-javascript-objects-and-arrays-by-string-path/6491621#6491621 + * However, tm:optional values start with / so it should be removed first **/ const resolvePath = (object, path, defaultValue) => path .split(/[\.\[\]\'\"]/) .filter(p => p) .reduce((o, p) => o ? o[p] : defaultValue, object) + let results = [] + if(td.hasOwnProperty("tm:optional")){ + td["tm:optional"].forEach(element => { + element = element.substring(1); + const pathTarget = resolvePath(td,element,"noTarget") + + if(pathTarget === "noTarget"){ + results.push({ + "ID": "tm-tmOptional-resolver", + "Status": "fail", + "Comment": "tm:optional does not resolve to an affordance" + }) + } else { + results.push({ + "ID": "tm-tmOptional-resolver", + "Status": "pass", + "Comment": "" + }) + } + }); + } else { + results.push({ + "ID": "tm-tmOptional-resolver", + "Status": "not-impl", + "Comment": "no use of tm:optional" + }) + } + + return results } \ No newline at end of file From c05b7deae6d564147e96af5d3bdcf9fd8ca5c105 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 13:53:52 +0200 Subject: [PATCH 12/28] fix tm optional resolver --- packages/core/shared.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/core/shared.js b/packages/core/shared.js index 6b14615f8..ef0f0d430 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -21,6 +21,20 @@ module.exports = { checkTmOptionalPointer } +/** + * This function returns part of the object given in param with the value found when resolving the path. Similar to JSON Pointers. + * In case no path is found, the param defaultValue is echoed back + * Taken from + * https://stackoverflow.com/questions/6491463/accessing-nested-javascript-objects-and-arrays-by-string-path/6491621#6491621 + * @param {object} object + * @param {string} path + * @param {any} defaultValue + * @return {object} + **/ +const resolvePath = (object, path, defaultValue) => path + .split(/[\.\[\]\'\"]/) + .filter(p => p) + .reduce((o, p) => o ? o[p] : defaultValue, object) // -------------------------------------------------- checkPropUniqueness @@ -899,25 +913,14 @@ function checkUriSecurity(td) { * @param {object} td The TD to do assertion tests */ function checkTmOptionalPointer(td){ - /* - * This function returns part of the object given in param with the value found when resolving the path. Similar to JSON Pointers. - * In case no path is found, the param defaultValue is echoed back - * Taken from - * https://stackoverflow.com/questions/6491463/accessing-nested-javascript-objects-and-arrays-by-string-path/6491621#6491621 - * However, tm:optional values start with / so it should be removed first - **/ - const resolvePath = (object, path, defaultValue) => path - .split(/[\.\[\]\'\"]/) - .filter(p => p) - .reduce((o, p) => o ? o[p] : defaultValue, object) - - let results = [] + const results = [] if(td.hasOwnProperty("tm:optional")){ td["tm:optional"].forEach(element => { - element = element.substring(1); + // However, tm: optional values start with / so it should be removed first + element = element.substring(1) + element = element.replace("/",".") // since the resolvePath uses . instead of / const pathTarget = resolvePath(td,element,"noTarget") - - if(pathTarget === "noTarget"){ + if (pathTarget === "noTarget" || pathTarget === undefined) { results.push({ "ID": "tm-tmOptional-resolver", "Status": "fail", From 4d42cb5f22e61dde1193d90d80732399ae1966cf Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 15:02:27 +0200 Subject: [PATCH 13/28] sync assertions to td repo --- packages/assertions/assertions-csv/assertions.csv | 14 +++++++------- packages/assertions/assertions-csv/implemented.csv | 8 ++++---- .../manual-generation-inputs/pre-implemented.csv | 7 ++++--- packages/assertions/assertions-csv/manual.csv | 3 ++- packages/assertions/assertions-csv/needsReview.csv | 3 ++- packages/assertions/assertions-csv/report.json | 2 +- .../assertions-td/td-vocab-model--VersionInfo.json | 1 - 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/assertions/assertions-csv/assertions.csv b/packages/assertions/assertions-csv/assertions.csv index df9bfd148..8a379122d 100644 --- a/packages/assertions/assertions-csv/assertions.csv +++ b/packages/assertions/assertions-csv/assertions.csv @@ -1,10 +1,10 @@ "ID","Status","Assertion" "bindings-requirements-scheme","null","Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding Template indicated by the URI scheme [[!RFC3986]] of its href member as indicated by the Binding Templates specification at Creating a New Protocol Binding." "bindings-server-accept","null","Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction." -"client-data-schema","null","A Thing acting as a Consumer when interacting with another target Thingdescribed in a WoT Thing Description MUST generate data organized according to the data schemas given in the correspondinginteractions." -"client-data-schema-accept-extras","null","A Thing acting as a Consumer when interacting with another Thing MUST accept withouterror any additional data not described in the data schemas given in the Thing Description of the target Thing." -"client-data-schema-no-extras","null","A Thing acting as a Consumer when interacting with another Thing MUST NOT generate datanot described in the data schemas given in the Thing Description of that Thing." -"client-uri-template","null","A Thing acting as a Consumer when interacting with another Thing MUST generate URIsaccording to the URI Templates, base URIs, and form href parametersgiven in the Thing Description of the target Thing." +"client-data-schema","null","A Consumer when interacting with another target Thingdescribed in a WoT Thing Description MUST generate data organized according to the data schemas given in the correspondinginteractions." +"client-data-schema-accept-extras","null","A Consumer when interacting with another Thing MUST accept withouterror any additional data not described in the data schemas given in the Thing Description of the target Thing." +"client-data-schema-no-extras","null","A Consumer when interacting with another Thing MUST NOT generate datanot described in the data schemas given in the Thing Description of that Thing." +"client-uri-template","null","A Consumer when interacting with another Thing MUST generate URIsaccording to the URI Templates, base URIs, and form href parametersgiven in the Thing Description of the target Thing." "privacy-auth-users-only","null","Only authorized users SHOULD be provided access to the Thing Description for a Thing." "privacy-centralized-ids","null","TD identifiers SHOULD NOT be generated using a centralized authority." "privacy-distributed-ids","null","TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness." @@ -440,7 +440,7 @@ "tm-ref-recursive-extensions","null","Recursive extensions leading to an infinite loop MUST NOT be defined." "tm-rel-type-maximum","null","The links array MUST use the entry with ""rel"" : ""type"" a maximum of once." "tm-td-generation-inconsistencies","null","A Thing Model MUST be defined in such a way that there are no inconsistencies that would result in a Thing Description not being able to meet the requirements as described in Section and ." -"tm-tmOptional","null","If interaction models are not manditory to be implemented in a Thing Description instance, Thing Model definitions MUST use the JSON member name tm:optional." +"tm-tmOptional","null","If interaction models are not mandatory to be implemented in a Thing Description instance, Thing Model definitions MUST use the JSON member name tm:optional." "tm-tmOptional-JSONPointer","null","The value of tm:optional MUST provide JSON Pointer [[RFC6901]] references to the required interaction model definitions." "tm-tmOptional-array","null","tm:optional MUST be a JSON array at the top level." "tm-tmOptional-resolver","null","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." @@ -450,6 +450,6 @@ "tm-tmRef-usecase","null","For importing pieces of definitions of one or more existing Thing Models, the tm:ref term is introduced that provides the location of an existing (sub-)definition that SHOULD be reused." "tm-tmRef1","null","The tm:ref value MUST follow the pattern" "tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." -"tm-versioning","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." -"tm-versioning","null","Due to the definition of Thing Model the term instance MUST be omitted within the version container." +"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." +"tm-versioning-2","null","Due to the definition of Thing Model the term instance MUST be omitted within the version container." "well-known-operation-types-only","null","operations types SHOULD NOT be arbitrarily set by servients and be restricted to the values in the table below." diff --git a/packages/assertions/assertions-csv/implemented.csv b/packages/assertions/assertions-csv/implemented.csv index 30825fdb8..0828a61b8 100644 --- a/packages/assertions/assertions-csv/implemented.csv +++ b/packages/assertions/assertions-csv/implemented.csv @@ -237,7 +237,7 @@ "td-vocab-exclusiveMinimum--NumberSchema","null","exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double.", "td-vocab-flow--OAuth2SecurityScheme","null","For the code flow both authorization and token MUST be included.", "td-vocab-format--BearerSecurityScheme","null","format: Specifies format of security authentication information (one of jwt, jwe, or jws). MUST be included. Type: string.", -"td-vocab-format--DataSchema","null","format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) $defs. . MAY be included. Type: string.", +"td-vocab-format--DataSchema","null","format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) definitions. . MAY be included. Type: string.", "td-vocab-forms--InteractionAffordance","null","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. MUST be included. Type: array of Form.", "td-vocab-forms--Thing","null","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form.", "td-vocab-href--Form","null","", @@ -295,7 +295,7 @@ "td-vocab-output--ActionAffordance","null","output: Used to define the output data schema of the action.", "td-vocab-pattern--StringSchema","null","pattern: Provides a regular expressions to express constraints of the string value. The regular expression must follow the [[ECMA-262]] dialect. MAY be included. Type: string.", "td-vocab-profile--Thing","null","profile: Indicates the WoT Profile mechanisms followed by this Thing Description and the corresponding Thing implementation. MAY be included. Type: anyURI or Array of anyURI.", -"td-vocab-properties--ObjectSchema","null","properties: Data schema nested $defs. MAY be included. Type: DataSchema.", +"td-vocab-properties--ObjectSchema","null","properties: Data schema nested definitions. MAY be included. Type: DataSchema.", "td-vocab-properties--Thing","null","Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)", "td-vocab-proxy--SecurityScheme","null","proxy: URI of the proxy server this security configuration provides access to. If not given, the corresponding security configuration is for the endpoint. MAY be included. Type: anyURI.", "td-vocab-qop--DigestSecurityScheme","null","qop: Quality of protection (one of auth or auth-int). MUST be included. Type: string.", @@ -350,7 +350,6 @@ "td-vocab-writeOnly--DataSchema","null","writeOnly: Boolean value that indicates whether a property interaction / value is write only (=true) or not (=false). MUST be included. Type: boolean.", "tm-compose-name-collision","null","", "tm-rel-type-maximum","null","", -"tm-versioning","null","model: Provides a version indicator of the underlying TM. instance. MAY be included. Type: string.", "well-known-operation-types-only","null","", "tm-compose-instanceName","null","", "tm-compose-submodel","null","", @@ -367,4 +366,5 @@ "tm-tmOptional-JSONPointer","null","", "tm-tmOptional-array","null","", "tm-tmRef-usecase","null","", -"tm-tmRef1","null","", \ No newline at end of file +"tm-tmRef1","null","", +"tm-versioning-2","null","", \ No newline at end of file diff --git a/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv b/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv index a74af4c6f..a26472452 100644 --- a/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv +++ b/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv @@ -237,7 +237,7 @@ "td-vocab-exclusiveMinimum--NumberSchema","not-impl",,"exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double." "td-vocab-flow--OAuth2SecurityScheme","not-impl",,"For the code flow both authorization and token MUST be included." "td-vocab-format--BearerSecurityScheme","not-impl",,"format: Specifies format of security authentication information (one of jwt, jwe, or jws). MUST be included. Type: string." -"td-vocab-format--DataSchema","not-impl",,"format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) $defs. . MAY be included. Type: string." +"td-vocab-format--DataSchema","not-impl",,"format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) definitions. . MAY be included. Type: string." "td-vocab-forms--InteractionAffordance","not-impl",,"forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. MUST be included. Type: array of Form." "td-vocab-forms--Thing","not-impl","data must have required property 'forms'","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form." "td-vocab-href--Form","not-impl","result of a merge", @@ -295,7 +295,7 @@ "td-vocab-output--ActionAffordance","not-impl",,"output: Used to define the output data schema of the action." "td-vocab-pattern--StringSchema","not-impl",,"pattern: Provides a regular expressions to express constraints of the string value. The regular expression must follow the [[ECMA-262]] dialect. MAY be included. Type: string." "td-vocab-profile--Thing","not-impl","data must have required property 'profile'","profile: Indicates the WoT Profile mechanisms followed by this Thing Description and the corresponding Thing implementation. MAY be included. Type: anyURI or Array of anyURI." -"td-vocab-properties--ObjectSchema","not-impl",,"properties: Data schema nested $defs. MAY be included. Type: DataSchema." +"td-vocab-properties--ObjectSchema","not-impl",,"properties: Data schema nested definitions. MAY be included. Type: DataSchema." "td-vocab-properties--Thing","not-impl","data must have required property 'properties'"," Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)" "td-vocab-proxy--SecurityScheme","not-impl",,"proxy: URI of the proxy server this security configuration provides access to. If not given, the corresponding security configuration is for the endpoint. MAY be included. Type: anyURI." "td-vocab-qop--DigestSecurityScheme","not-impl",,"qop: Quality of protection (one of auth or auth-int). MUST be included. Type: string." @@ -350,7 +350,6 @@ "td-vocab-writeOnly--DataSchema","not-impl",,"writeOnly: Boolean value that indicates whether a property interaction / value is write only (=true) or not (=false). MUST be included. Type: boolean." "tm-compose-name-collision","not-impl",, "tm-rel-type-maximum","not-impl","no links array in the td", -"tm-versioning","not-impl","data must have required property 'version'","model: Provides a version indicator of the underlying TM. instance. MAY be included. Type: string." "well-known-operation-types-only","not-impl","result of a merge", "bindings-requirements-scheme","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding indicated by the URI scheme of its href member." "bindings-server-accept","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction." @@ -400,6 +399,7 @@ "td-security-no-secrets","null","not testable with Assertion Tester","For all security schemes, any private keys, passwords, or other sensitive information directly providing access should be shared and stored out-of-band and MUST NOT be stored in the TD." "td-vocabulary-defaults","null","not testable with Assertion Tester","When assignments in a TD are missing, a TD Processor MUST follow the Default Value assignments expressed in the table of." "well-known-operation-types-only","null","not testable with Assertion Tester","operations types SHOULD NOT be arbitrarily set by servients." +"ID","Status","Comment","Assertion" "tm-compose-instanceName","not-impl",, "tm-compose-submodel","not-impl",, "tm-context-requirement","pass",, @@ -416,3 +416,4 @@ "tm-tmOptional-array","not-impl","data must have required property 'tm:optional'", "tm-tmRef-usecase","not-impl",, "tm-tmRef1","not-impl",, +"tm-versioning-2","not-impl","data must have required property 'version'", diff --git a/packages/assertions/assertions-csv/manual.csv b/packages/assertions/assertions-csv/manual.csv index 3a5368d47..7b433cd0d 100644 --- a/packages/assertions/assertions-csv/manual.csv +++ b/packages/assertions/assertions-csv/manual.csv @@ -87,4 +87,5 @@ "tm-tmRef-overwrite-possibility","null","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value.","" "tm-tmRef-overwrite-process","null","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs.","" "tm-tmRef-overwrite-semantic-meaning","null","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition.","" -"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" \ No newline at end of file +"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" +"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container.","" \ No newline at end of file diff --git a/packages/assertions/assertions-csv/needsReview.csv b/packages/assertions/assertions-csv/needsReview.csv index 3a33d2dbf..22f4e237e 100644 --- a/packages/assertions/assertions-csv/needsReview.csv +++ b/packages/assertions/assertions-csv/needsReview.csv @@ -39,4 +39,5 @@ "tm-tmRef-overwrite-possibility","null","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value.","" "tm-tmRef-overwrite-process","null","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs.","" "tm-tmRef-overwrite-semantic-meaning","null","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition.","" -"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" \ No newline at end of file +"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" +"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container.","" \ No newline at end of file diff --git a/packages/assertions/assertions-csv/report.json b/packages/assertions/assertions-csv/report.json index 39b010fbb..090219d37 100644 --- a/packages/assertions/assertions-csv/report.json +++ b/packages/assertions/assertions-csv/report.json @@ -1 +1 @@ -{"generationDate":"Wed, 24 Aug 2022 01:26:41 GMT","assertionsSize":454,"implementedSize":369,"manualSize":89,"oldSize":0,"needsReviewSize":41} \ No newline at end of file +{"generationDate":"Thu, 06 Oct 2022 13:01:16 GMT","assertionsSize":454,"implementedSize":369,"manualSize":90,"oldSize":0,"needsReviewSize":42} \ No newline at end of file diff --git a/packages/assertions/assertions-td/td-vocab-model--VersionInfo.json b/packages/assertions/assertions-td/td-vocab-model--VersionInfo.json index c37d9af26..c85c5690b 100644 --- a/packages/assertions/assertions-td/td-vocab-model--VersionInfo.json +++ b/packages/assertions/assertions-td/td-vocab-model--VersionInfo.json @@ -3,7 +3,6 @@ "description": "model: Provides a version indicator of the underlying TM. instance. MAY be included. Type: string.", "$schema ": "http://json-schema.org/draft/2019-09/schema#", "is-complex": false, - "also":["tm-versioning"], "type": "object", "properties": { "version": { From 63f0d9548029df6fa5e5543fa4a3a7b3f88af906 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 15:20:14 +0200 Subject: [PATCH 14/28] add comment description fields --- packages/assertions/generate-manual-csv.js | 79 ++++++++++++++++------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/packages/assertions/generate-manual-csv.js b/packages/assertions/generate-manual-csv.js index ce840164d..03038739b 100644 --- a/packages/assertions/generate-manual-csv.js +++ b/packages/assertions/generate-manual-csv.js @@ -4,21 +4,31 @@ // JSON to CSV and vice versa libraries const Json2CsvParser = require('json2csv').Parser const csvjson = require('csvjson') -const { readFileSync, writeFileSync } = require('fs') +const { + readFileSync, + writeFileSync +} = require('fs') const path = require("path") // const assert = require('node:assert').strict -const csvGenerator = new Json2CsvParser({fields: ["ID", "Status", "Assertion", "Comment"]}) +const csvGenerator = new Json2CsvParser({ + fields: ["ID", "Status", "Comment", "Description"] +}) const mainPath = path.join("assertions-csv") const assertionsPath = path.join("assertions-csv", "assertions.csv") const preImplementedPath = path.join("assertions-csv", "manual-generation-inputs", "pre-implemented.csv") +const manualFlag = "not testable with Assertion Tester" /** ======================================================================== * Read and Parse CSV *========================================================================**/ -const assertionsTableCSV = readFileSync(assertionsPath, {encoding: "utf-8"}) -const preImplementedPathCSV = readFileSync(preImplementedPath, {encoding: "utf-8"}) +const assertionsTableCSV = readFileSync(assertionsPath, { + encoding: "utf-8" +}) +const preImplementedPathCSV = readFileSync(preImplementedPath, { + encoding: "utf-8" +}) const csvParserOptions = { delimiter: ',', // optional @@ -32,14 +42,20 @@ const preImplementedTable = csvjson.toObject(preImplementedPathCSV, csvParserOpt * Determine and Remove Old Assertions *========================================================================**/ - const oldAssertionsTable = [] - let index = 0 - let iterations = preImplementedTable.length - for(let iteration = 0; iteration < iterations; iteration++) { - const isNotFound = assertionsTable.findIndex(assertion => {return preImplementedTable[index].ID === assertion.ID}) === -1 - if(isNotFound) { - oldAssertionsTable.push({"ID": preImplementedTable[index].ID, "Assertion": preImplementedTable[index].Assertion}) - preImplementedTable.splice(index, 1) +const oldAssertionsTable = [] +let index = 0 +let iterations = preImplementedTable.length +for (let iteration = 0; iteration < iterations; iteration++) { + const isNotFound = assertionsTable.findIndex(assertion => { + return preImplementedTable[index].ID === assertion.ID + }) === -1 + if (isNotFound) { + oldAssertionsTable.push({ + "ID": preImplementedTable[index].ID, + "Description": preImplementedTable[index].Assertion, + "Comment": manualFlag + }) + preImplementedTable.splice(index, 1) } else { index++ } @@ -52,12 +68,17 @@ const manualTable = [] const needsReviewTable = [] /* ================== Add old manual assertions ================= */ -const manualFlag = "not testable with Assertion Tester" + index = 0 iterations = preImplementedTable.length -for(let iteration = 0; iteration < iterations; iteration++) { - if(preImplementedTable[index].Comment === manualFlag) { - manualTable.push({"ID": preImplementedTable[index].ID, "Status": "null", "Assertion": preImplementedTable[index].Assertion}) +for (let iteration = 0; iteration < iterations; iteration++) { + if (preImplementedTable[index].Comment === manualFlag) { + manualTable.push({ + "ID": preImplementedTable[index].ID, + "Status": "null", + "Description": preImplementedTable[index].Assertion, + "Comment": manualFlag + }) preImplementedTable.splice(index, 1) } else { preImplementedTable[index].Status = "null" @@ -66,12 +87,26 @@ for(let iteration = 0; iteration < iterations; iteration++) { } } /* ================== Add new manual assertions ================= */ -for(const assertion of assertionsTable) { - const isNotFound = preImplementedTable.findIndex(implementedAssertion => {return implementedAssertion.ID === assertion.ID}) === -1 - const manualIsNotFound = manualTable.findIndex(manualAssertion => {return manualAssertion.ID === assertion.ID}) === -1 - if(isNotFound && manualIsNotFound) { - manualTable.push({"ID": assertion.ID, "Status": "null", "Assertion": assertion.Assertion, "Comment": ""}) - needsReviewTable.push({"ID": assertion.ID, "Status": "null", "Assertion": assertion.Assertion, "Comment": ""}) +for (const assertion of assertionsTable) { + const isNotFound = preImplementedTable.findIndex(implementedAssertion => { + return implementedAssertion.ID === assertion.ID + }) === -1 + const manualIsNotFound = manualTable.findIndex(manualAssertion => { + return manualAssertion.ID === assertion.ID + }) === -1 + if (isNotFound && manualIsNotFound) { + manualTable.push({ + "ID": assertion.ID, + "Status": "null", + "Description": assertion.Assertion, + "Comment": manualFlag + }) + needsReviewTable.push({ + "ID": assertion.ID, + "Status": "null", + "Description": assertion.Assertion, + "Comment": manualFlag + }) } } From 89bd801011169edcdc1831dff72aecddd23ec9e0 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 15:23:51 +0200 Subject: [PATCH 15/28] sync with testing to use description --- packages/assertions/assertionTests-td.js | 18 +- .../assertions/assertions-csv/implemented.csv | 740 +++++++++--------- .../pre-implemented.csv | 100 +-- packages/assertions/assertions-csv/manual.csv | 182 ++--- .../assertions/assertions-csv/needsReview.csv | 86 +- packages/assertions/assertions-csv/old.csv | 2 +- .../assertions/assertions-csv/report.json | 2 +- packages/assertions/index.js | 2 +- 8 files changed, 566 insertions(+), 566 deletions(-) diff --git a/packages/assertions/assertionTests-td.js b/packages/assertions/assertionTests-td.js index 361a461e9..4e2b042bc 100644 --- a/packages/assertions/assertionTests-td.js +++ b/packages/assertions/assertionTests-td.js @@ -122,7 +122,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { results.push({ "ID": schema.title, "Status": "not-impl", - "Assertion": schema.description + "Description": schema.description }) if (schema.hasOwnProperty("also")) { const otherAssertions = schema.also @@ -145,14 +145,14 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { results.push({ "ID": schema.title, "Status": result, - "Assertion": schema.description + "Description": schema.description }) } else { results.push({ "ID": schema.title, "Status": result, "Comment": validPayload.ajvObject.errorsText(), - "Assertion": schema.description + "Description": schema.description }) } if (schema.hasOwnProperty("also")) { @@ -170,7 +170,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { "ID": schema.title, "Status": "fail", "Comment": "Make sure you validate your TD before", - "Assertion": schema.description + "Description": schema.description }) if (schema.hasOwnProperty("also")) { @@ -198,7 +198,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { results.push({ "ID": asser, "Status": "pass", - "Assertion": schema.description + "Description": schema.description }) }) } @@ -212,7 +212,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { "ID": schema.title, "Status": "not-impl", "Comment": validPayload.ajvObject.errorsText(), - "Assertion": schema.description + "Description": schema.description }) if (schema.hasOwnProperty("also")) { const otherAssertions = schema.also @@ -221,7 +221,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { "ID": asser, "Status": "not-impl", "Comment": validPayload.ajvObject.errorsText(), - "Assertion": schema.description + "Description": schema.description }) }) } @@ -231,7 +231,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { "ID": schema.title, "Status": "fail", "Comment": validPayload.ajvObject.errorsText(), - "Assertion": schema.description + "Description": schema.description }) if (schema.hasOwnProperty("also")) { const otherAssertions = schema.also @@ -240,7 +240,7 @@ function validateTD(tdData, assertions, manualAssertions, logFunc) { "ID": asser, "Status": "fail", "Comment": validPayload.ajvObject.errorsText(), - "Assertion": schema.description + "Description": schema.description }) }) } diff --git a/packages/assertions/assertions-csv/implemented.csv b/packages/assertions/assertions-csv/implemented.csv index 0828a61b8..f436992fc 100644 --- a/packages/assertions/assertions-csv/implemented.csv +++ b/packages/assertions/assertions-csv/implemented.csv @@ -1,370 +1,370 @@ -"ID","Status","Assertion","Comment" -"privacy-distributed-ids","null","TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness.", -"privacy-id-metadata","null","TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness.", -"sec-body-name-json-pointer","null","When used in the context of a body security information location, the value of name MUST be in the form of a JSON pointer [[!RFC6901]] relative to the root of the input DataSchema for each interaction it is used with.", -"sec-body-name-json-pointer-array","null","The JSON pointer used in the body locator MAY use the - character to indicate a non-existent array element when it is necessary to insert an element after the last element of an existing array", -"sec-security-vocab-auto-in-no-name","null","", -"sec-vuln-auto","null","", -"td-action-arrays","null","The type of the members forms MUST be serialized as a JSON array.", -"td-action-names","null","", -"td-action-names_at-type","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-names_description","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-names_descriptions","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-names_forms","null","The type of the members forms MUST be serialized as a JSON array.", -"td-action-names_idempotent","null","", -"td-action-names_input","null","", -"td-action-names_output","null","", -"td-action-names_safe","null","", -"td-action-names_title","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-names_titles","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-names_uriVariables","null","Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object.", -"td-action-objects","null","", -"td-action-objects_input","null","", -"td-action-objects_output","null","", -"td-actions","null","", -"td-actions_existence","null","Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)", -"td-actions_uniqueness","null","", -"td-additionalExpectedResponse-contentType","null","", -"td-additionalExpectedResponse-schema","null","", -"td-array-type","null","", -"td-arrays","null","", -"td-arrays_forms","null","", -"td-arrays_links","null","Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name.", -"td-boolean-type","null","", -"td-class-type","null","", -"td-context","null","The root element of a TD Serialization MUST be a JSON object that includes a member with the name @context and a value of type string or array that equals or respectively contains https://www.w3.org/2022/wot/td/v1.1.", -"td-context-default-language","null","schema", -"td-context-ns-td10-namespace","null","When there are possibly TD 1.0 consumers the anyURI https://www.w3.org/2019/wot/td/v1 MUST be the first entry and the https://www.w3.org/2022/wot/td/v1.1 MUST be the second entry.", -"td-context-ns-thing-mandatory","null","", -"td-context-ns-thing-map-of-namespaces","null","schema", -"td-context-ns-thing-optional","null","schema", -"td-context-toplevel","null","", -"td-data-schema","null","", -"td-data-schema-arrays","null","", -"td-data-schema-arrays_enum","null","", -"td-data-schema-arrays_oneOf","null","", -"td-data-schema-arrays_required","null","", -"td-data-schema-objects","null","", -"td-data-schema-objects-arrays","null","", -"td-data-schema_at-type","null","", -"td-data-schema_const","null","", -"td-data-schema_contentEncoding","null","", -"td-data-schema_contentMediaType","null","", -"td-data-schema_description","null","", -"td-data-schema_descriptions","null","", -"td-data-schema_enum","null","", -"td-data-schema_exclusiveMaximum-IntegerSchema","null","", -"td-data-schema_exclusiveMaximum-NumberSchema","null","", -"td-data-schema_exclusiveMinimum-IntegerSchema","null","", -"td-data-schema_exclusiveMinimum-NumberSchema","null","", -"td-data-schema_format","null","", -"td-data-schema_items","null","", -"td-data-schema_maxItems","null","", -"td-data-schema_maxLength","null","", -"td-data-schema_maximum-IntegerSchema","null","", -"td-data-schema_maximum-NumberSchema","null","", -"td-data-schema_minItems","null","", -"td-data-schema_minLength","null","", -"td-data-schema_minimum-IntegerSchema","null","", -"td-data-schema_minimum-NumberSchema","null","", -"td-data-schema_multipleOf-IntegerSchema","null","", -"td-data-schema_multipleOf-NumberSchema","null","", -"td-data-schema_oneOf","null","", -"td-data-schema_pattern","null","", -"td-data-schema_properties","null","", -"td-data-schema_readOnly","null","", -"td-data-schema_required","null","", -"td-data-schema_title","null","", -"td-data-schema_titles","null","", -"td-data-schema_type","null","", -"td-data-schema_unit","null","", -"td-data-schema_writeOnly","null","", -"td-datetime-recommended-type","null","", -"td-datetime-type","null","", -"td-event-arrays","null","The type of the members forms MUST be serialized as a JSON array.", -"td-event-names","null","", -"td-event-names_at-type","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-names_cancellation","null","", -"td-event-names_data","null","", -"td-event-names_dataResponse","null","", -"td-event-names_description","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-names_descriptions","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-names_forms","null","The type of the members forms MUST be serialized as a JSON array.", -"td-event-names_subscription","null","", -"td-event-names_title","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-names_titles","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-names_uriVariables","null","Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object.", -"td-event-objects","null","", -"td-event-objects_cancellation","null","", -"td-event-objects_data","null","", -"td-event-objects_dataResponse","null","", -"td-event-objects_subscription","null","", -"td-events","null","", -"td-events_existence","null","Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)", -"td-events_uniqueness","null","", -"td-expectedResponse-contentType","null","", -"td-form-response-object","null","", -"td-format-validation-known-values","null","", -"td-forms","null","", -"td-forms-response","null","", -"td-integer-type","null","", -"td-json-open","null","", -"td-json-open_utf-8","null","", -"td-links","null","Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name.", -"td-map-type","null","", -"td-multi-languages","null","", -"td-multi-languages-consistent","null","", -"td-multi-languages_descriptions","null","", -"td-multi-languages_titles","null","", -"td-multilanguage-language-tag","null","", -"td-multilanguage-value","null","", -"td-number-type","null","", -"td-objects","null","", -"td-objects_actions","null","Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)", -"td-objects_descriptions","null","", -"td-objects_events","null","Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)", -"td-objects_properties","null","Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)", -"td-objects_schemaDefinitions","null","schemaDefinitions: Set of named data schemas. To be used in a schema name-value pair inside an AdditionalExpectedResponse object. MAY be included. Type: Map of DataSchema.", -"td-objects_securityDefinitions","null","", -"td-objects_uriVariables","null","", -"td-objects_version","null","The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces.", -"td-op-for-action","null","When a forms term member is present in an Action instance, the value(s) of op in the forms MUST be invokeaction.", -"td-op-for-event","null","When a forms term member is present in an Event instance, the value(s) of op in the forms MUST be one of subscribeevent or unsubscribeevent.", -"td-op-for-property","null","When a forms term member is present in a Property instance, the value(s) of op in the forms MUST be one of readproperty, writeproperty or observeproperty.", -"td-op-for-thing","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-processor","null","", -"td-properties","null","", -"td-properties_existence","null","Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)", -"td-properties_uniqueness","null","", -"td-property-arrays","null","The type of the member forms MUST be serialized as a JSON array.", -"td-property-names","null","", -"td-property-names_at-type","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_const","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_contentEncoding","null","", -"td-property-names_contentMediaType","null","", -"td-property-names_description","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_descriptions","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_enum","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_exclusiveMaximum","null","", -"td-property-names_exclusiveMinimum","null","", -"td-property-names_format","null","", -"td-property-names_forms","null","", -"td-property-names_items","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_maxItems","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_maxLength","null","", -"td-property-names_maximum","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_minItems","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_minLength","null","", -"td-property-names_minimum","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_multipleOf","null","", -"td-property-names_observable","null","", -"td-property-names_oneOf","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_properties","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_readOnly","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_required","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_title","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_titles","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_type","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_unit","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_uriVariables","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-property-names_writeOnly","null","Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time.", -"td-security","null","", -"td-security-activation","null","", -"td-security-bearer-format-extensions","null","", -"td-security-bearer-format-extensions_alg","null","alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string.", -"td-security-bearer-format-extensions_format","null","alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string.", -"td-security-binding","null","", -"td-security-combo-deprecation","null","", -"td-security-combo-exclusive-oneof-or-allof","null","Exactly one of either oneOf or allOf MUST be included.", -"td-security-in-query-over-uri","null","The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable.", -"td-security-in-uri-variable","null","", -"td-security-mandatory","null","", -"td-security-oauth2-client-flow","null","For the client flow token MUST be included.", -"td-security-oauth2-client-flow-no-auth","null","", -"td-security-oauth2-code-flow","null","For the code flow both authorization and token MUST be included.", -"td-security-oauth2-device-flow","null","For the device flow both authorization and token MUST be included.", -"td-security-overrides","null","", -"td-security-scheme-name","null","", -"td-security-schemes","null","", -"td-security-uri-variables-distinct","null","", -"td-string-type","null","", -"td-text-at-direction","null","The root element of a TD Serialization MUST be a JSON object that includes a member with the name @context and a value of type string or array that equals or respectively contains https://www.w3.org/2022/wot/td/v1.1.", -"td-title-description","null","", -"td-title-description_descriptions","null","If title and titles description and descriptions are defined at the same time at the JSON level, title and description MAY be seen as default text.", -"td-title-description_titles","null","If title and titles description and descriptions are defined at the same time at the JSON level, title and description MAY be seen as default text.", -"td-titles-descriptions","null","", -"td-uriVariables-dataschema","null","", -"td-uriVariables-names","null","", -"td-version","null","The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces.", -"td-vocab-actions--Thing","null","Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)", -"td-vocab-additionalResponses--Form","null","additionalResponses: This optional term can be used if additional expected responses are possible, e.g. for error reporting. Each additional response needs to be distinguished from others in some way (for example, by specifying a protocol-specific error code), and may also have its own data schema. MAY be included. Type: AdditionalExpectedResponse or Array of AdditionalExpectedResponse.", -"td-vocab-alg--BearerSecurityScheme","null","alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string.", -"td-vocab-allOf--ComboSecurityScheme","null","allOf: Array of two or more strings identifying other named security scheme definitions, all of which must be satisfied for access. MUST be included. Type: string or Array of string.", -"td-vocab-anchor--Link","null","anchor: By default, the context of a link is the URL of the representation it is associated with, and is serialised as a URI. When present, the anchor parameter overrides this with another URI, such as a fragment of this resource, or a third resource (i.e., when the anchor value is an absolute URI).", -"td-vocab-at-context--Thing","null","", -"td-vocab-at-type--DataSchema","null","@type: Known from JSON-LD [[!json-ld]], @type is used to state that values described by the DataSchema are instances of a class. Each string in the value array represents a class. MAY be included. Type: array of string.", -"td-vocab-at-type--InteractionAffordance","null","@type: Known from JSON-LD [[!json-ld]], @type is used to state that an interaction resource is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string.", -"td-vocab-at-type--SecurityScheme","null","@type: Known from JSON-LD [[!json-ld]], @type is used to state that a security mechanism configured by the SecurityScheme is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string.", -"td-vocab-at-type--Thing","null","@type: Known from JSON-LD [[!json-ld]], @type is used to state that a thing resource is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string.", -"td-vocab-authorization--BearerSecurityScheme","null","authorization: URI of the authorization server. MAY be included. Type: anyURI.", -"td-vocab-authorization--OAuth2SecurityScheme","null","authorization: URI of the authorization server. MAY be included. Type: anyURI.", -"td-vocab-base--Thing","null","base: Define the base URI that is valid for all defined local interaction resources. All other URIs in the TD must then be resolved using the algorithm defined in [[!RFC3986]].", -"td-vocab-cancellation--EventAffordance","null","cancellation: Defines any data that needs to be passed to cancel a subscription, e.g., a specific message to remove a Webhook.", -"td-vocab-const--DataSchema","null","const: Provides a constant value. MAY be included. Type: any type.", -"td-vocab-contentCoding--Form","null","contentCoding: Content coding values indicate an encoding transformation that has been or can be applied to a representation. Content codings are primarily used to allow a representation to be compressed or otherwise usefully transformed without losing the identity of its underlying media type and without loss of information.", -"td-vocab-contentEncoding--StringSchema","null","contentEncoding: Specifies the encoding used to store the contents", -"td-vocab-contentMediaType--StringSchema","null","contentMediaType: Specifies the MIME type (e.g., image/png, audio/mpeg) of the contents of a string value, as described in RFC 2046. MAY be included. Type: string.", -"td-vocab-contentType--AdditionalExpectedResponse","null","contentType: Assign a content type based on a media type (e.g., text/plain) and potential parameters (e.g., charset=utf-8) for the media type [RFC2046]. MAY be included. Type: string.", -"td-vocab-contentType--ExpectedResponse","null","", -"td-vocab-contentType--Form","null","contentType: Assign a content type based on a media type [[!MEDIATYPES]] (e.g., 'application/json) and (optional) parameters (e.g., 'charset=utf-8').", -"td-vocab-created--Thing","null","created: Provides information when the TD instance was created.", -"td-vocab-data--EventAffordance","null","data: Defines the data schema of the Event instance messages pushed by the Thing.", -"td-vocab-dataResponse--EventAffordance","null","dataResponse: Defines the data schema of the Event response messages sent be the consumer in a response to a data message.", -"td-vocab-default--DataSchema","null","default: Supply a default value. The value should validate against the data schema in which it resides. MAY be included. Type: any type.", -"td-vocab-description--DataSchema","null","description: Provides additional (human-readable) information based on a default language. MAY be included. Type: string.", -"td-vocab-description--InteractionAffordance","null","description: Provides additional (human-readable) information based on a default language. MAY be included. Type: string.", -"td-vocab-description--SecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-description--Thing","null","", -"td-vocab-descriptions--DataSchema","null","descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage.", -"td-vocab-descriptions--InteractionAffordance","null","descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage.", -"td-vocab-descriptions--SecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-descriptions--Thing","null","descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage.", -"td-vocab-enum--DataSchema","null","enum: Restricted set of values provided as an array.", -"td-vocab-events--Thing","null","Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)", -"td-vocab-exclusiveMaximum--IntegerSchema","null","exclusiveMaximum: Specifies a maximum numeric value, representing an exclusive upper limit. Only applicable for associated number or integer types. MAY be included. Type: integer.", -"td-vocab-exclusiveMaximum--NumberSchema","null","exclusiveMaximum: Specifies a maximum numeric value, representing an exclusive upper limit. Only applicable for associated number or integer types. MAY be included. Type: double.", -"td-vocab-exclusiveMinimum--IntegerSchema","null","exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: integer.", -"td-vocab-exclusiveMinimum--NumberSchema","null","exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double.", -"td-vocab-flow--OAuth2SecurityScheme","null","For the code flow both authorization and token MUST be included.", -"td-vocab-format--BearerSecurityScheme","null","format: Specifies format of security authentication information (one of jwt, jwe, or jws). MUST be included. Type: string.", -"td-vocab-format--DataSchema","null","format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) definitions. . MAY be included. Type: string.", -"td-vocab-forms--InteractionAffordance","null","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. MUST be included. Type: array of Form.", -"td-vocab-forms--Thing","null","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form.", -"td-vocab-href--Form","null","", -"td-vocab-href--Link","null","Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name.", -"td-vocab-hreflang--Link","null","anchor: By default, the context of a link is the URL of the representation it is associated with, and is serialised as a URI. When present, the anchor parameter overrides this with another URI, such as a fragment of this resource, or a third resource (i.e., when the anchor value is an absolute URI).", -"td-vocab-id--Thing","null","", -"td-vocab-idempotent--ActionAffordance","null","idempotent: Indicates whether the action is idempotent (=true) or not. Informs whether the action can be called repeatedly with the same result, if present, based on the same input.", -"td-vocab-identity--PSKSecurityScheme","null","identity: Pre-shared key identity. MAY be included. Type: string.", -"td-vocab-in--APIKeySecurityScheme","null","in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string.", -"td-vocab-in--BasicSecurityScheme","null","in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string.", -"td-vocab-in--BearerSecurityScheme","null","in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string.", -"td-vocab-in--DigestSecurityScheme","null","in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string.", -"td-vocab-input--ActionAffordance","null","input: Used to define the input data schema of the action.", -"td-vocab-instance--VersionInfo","null","The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces.", -"td-vocab-items--ArraySchema","null","items: Used to define the characteristics of an array. MAY be included. Type: DataSchema.", -"td-vocab-links--Thing","null","Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name.", -"td-vocab-maxItems--ArraySchema","null","maxItems: Defines the maximum number of items that have to be in the array. MAY be included. Type: unsignedInt.", -"td-vocab-maxLength--StringSchema","null","maxLength: Specifies the maximum length of a string. Only applicable for associated string types. MAY be included. Type: unsignedInt.", -"td-vocab-maximum--IntegerSchema","null","maximum: Specifies a maximum numeric value. Only applicable for associated number or integer types. MAY be included. Type: integer.", -"td-vocab-maximum--NumberSchema","null","maximum: Specifies a maximum numeric value. Only applicable for associated number or integer types. MAY be included. Type: double.", -"td-vocab-minItems--ArraySchema","null","minItems: Defines the minimum number of items that have to be in the array. MAY be included. Type: unsignedInt.", -"td-vocab-minLength--StringSchema","null","minLength: Specifies the minimum length of a string. Only applicable for associated string types. MAY be included. Type: unsignedInt.", -"td-vocab-minimum--IntegerSchema","null","minimum: Specifies a minimum numeric value. Only applicable for associated number or integer types. MAY be included. Type: integer.", -"td-vocab-minimum--NumberSchema","null","minimum: Specifies a minimum numeric value. Only applicable for associated number or integer types. MAY be included. Type: double.", -"td-vocab-model--VersionInfo","null","model: Provides a version indicator of the underlying TM. instance. MAY be included. Type: string.", -"td-vocab-modified--Thing","null","modified: Provides information when the TD instance was last modified.", -"td-vocab-multipleOf--IntegerSchema","null","multipleOf: Specifies the multipleOf value number. The value must strictly greater than 0. Only applicable for associated number or integer types. MAY be included. Type: integer.", -"td-vocab-multipleOf--NumberSchema","null","exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double.", -"td-vocab-name--APIKeySecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-name--BasicSecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-name--BearerSecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-name--DigestSecurityScheme","null","name: Name for query, header, or cookie parameters. MAY be included. Type: string.", -"td-vocab-observable--PropertyAffordance","null",") the Property, to receive change notifications or periodic updates (true/false).", -"td-vocab-oneOf--ComboSecurityScheme","null","oneOf: Array of two or more strings identifying other named security scheme definitions, any one of which, when satisfied, will allow access. Only one may be chosen for use. MUST be included. Type: string or Array of string.", -"td-vocab-oneOf--DataSchema","null","oneOf: Used to ensure that the data is valid against one of the specified schemas in the array. MAY be included. Type: array of DataSchema.", -"td-vocab-op--Form","null","", -"td-vocab-op--Form_cancelaction","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_invokeaction","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_observeallproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_observeproperty","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_queryaction","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_queryallactions","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_readallproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_readmultipleproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readmultipleproperties.", -"td-vocab-op--Form_readproperty","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_subscribeallevents","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_subscribeevent","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_unobserveallproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_unobserveproperty","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_unsubscribeallevents","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_unsubscribeevent","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-op--Form_writeallproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties.", -"td-vocab-op--Form_writemultipleproperties","null","When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of writemultipleproperties.", -"td-vocab-op--Form_writeproperty","null","op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required.", -"td-vocab-output--ActionAffordance","null","output: Used to define the output data schema of the action.", -"td-vocab-pattern--StringSchema","null","pattern: Provides a regular expressions to express constraints of the string value. The regular expression must follow the [[ECMA-262]] dialect. MAY be included. Type: string.", -"td-vocab-profile--Thing","null","profile: Indicates the WoT Profile mechanisms followed by this Thing Description and the corresponding Thing implementation. MAY be included. Type: anyURI or Array of anyURI.", -"td-vocab-properties--ObjectSchema","null","properties: Data schema nested definitions. MAY be included. Type: DataSchema.", -"td-vocab-properties--Thing","null","Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)", -"td-vocab-proxy--SecurityScheme","null","proxy: URI of the proxy server this security configuration provides access to. If not given, the corresponding security configuration is for the endpoint. MAY be included. Type: anyURI.", -"td-vocab-qop--DigestSecurityScheme","null","qop: Quality of protection (one of auth or auth-int). MUST be included. Type: string.", -"td-vocab-readOnly--DataSchema","null","readOnly: Boolean value that indicates whether a property interaction / value is read only (=true) or not (=false). MUST be included. Type: boolean.", -"td-vocab-refresh--OAuth2SecurityScheme","null","refresh: URI of the refresh server. MAY be included. Type: anyURI.", -"td-vocab-rel--Link","null","rel: Indicates the relation to an other Thing.", -"td-vocab-required--ObjectSchema","null","required: Defines which members of the object type are mandatory. MAY be included. Type: array of string.", -"td-vocab-response--Form","null","response: This optional term can be used if, e.g., the output communication metadata differ from input metdata (e.g., output contentType differ from the input contentType). The response name contains metadata that is only valid for the reponse messages.", -"td-vocab-safe--ActionAffordance","null","safe: Signals if the action is safe (=true) or not. Used to signal if there is no internal state (cf. resource state) is changed when invoking an Action. In that case responses can be cached as example.", -"td-vocab-schema--AdditionalExpectedResponse","null","success: Signals if an additional response should not be considered an error.", -"td-vocab-schemaDefinitions--Thing","null","schemaDefinitions: Set of named data schemas. To be used in a schema name-value pair inside an AdditionalExpectedResponse object. MAY be included. Type: Map of DataSchema.", -"td-vocab-scheme--SecurityScheme","null","", -"td-vocab-scheme--SecurityScheme_apikey","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string apikey.", -"td-vocab-scheme--SecurityScheme_auto","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string auto.", -"td-vocab-scheme--SecurityScheme_basic","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string basic.", -"td-vocab-scheme--SecurityScheme_bearer","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string bearer.", -"td-vocab-scheme--SecurityScheme_digest","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string digest.", -"td-vocab-scheme--SecurityScheme_nosec","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string nosec.", -"td-vocab-scheme--SecurityScheme_oauth2","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string oauth2.", -"td-vocab-scheme--SecurityScheme_psk","null","scheme: Identification of security mechanism being configured. MUST be included. Type: string psk.", -"td-vocab-scopes--Form","null","scopes: Set of authorization scope identifiers, provided as an array. These are provided in tokens returned by an authorization server and associated with forms in order to identify what resources a client may access and how.", -"td-vocab-scopes--OAuth2SecurityScheme","null","scopes: Set of authorization scope identifiers, provided as an array. These are provided in tokens returned by an authorization server and associated with forms in order to identify what resources a client may access and how.", -"td-vocab-security--Form","null","security: Set of security definition names, chosen from those defined in securityDefinitions. These must all be satisfied for access to resources at or below the current level, if not overridden at a lower level. MAY be included. Type: array of string.", -"td-vocab-security--Thing","null","", -"td-vocab-securityDefinitions--Thing","null","", -"td-vocab-sizes--Link","null",". The value pattern follows {Height}x{Width} (e.g.", -"td-vocab-subprotocol--Form","null","subprotocol: Indicates the exact mechanism by which an interaction will be accomplished for a given protocol when there are multiple options. For example, for HTTP and Events, it indicates which of several available mechanisms should be used for asynchronous notifications such as long polling (longpoll), WebSub [websub] (websub), Server-Sent Events (sse) [html] (also known as EventSource). Please note that there is no restriction on the subprotocol selection and other mechanisms can also be announced by this subprotocol term.", -"td-vocab-subscription--EventAffordance","null","subscription: Defines data that needs to be passed upon subscription, e.g., filters or message format for setting up Webhooks.", -"td-vocab-success--AdditionalExpectedResponse","null","success: Signals if an additional response should not be considered an error.", -"td-vocab-support--Thing","null","support: Provides information about the TD maintainer (e.g., author, link or telephone number to get support, etc).", -"td-vocab-synchronous--ActionAffordance","null","synchronous: Indicates whether the action is synchronous (=true) or not. A synchronous action means that the response of action contains all the information about the result of the action and no further querying about the status of the action is needed. Lack of this keyword means that no claim on the synchronicity of the action can be made. Type: boolean", -"td-vocab-title--DataSchema","null","title: Provides a human-readable title (e.g., display a text for UI representation) of the interaction pattern based on a default language. MAY be included. Type: string.", -"td-vocab-title--InteractionAffordance","null","title: Provides a human-readable title (e.g., display a text for UI representation) of the interaction pattern based on a default language. MAY be included. Type: string.", -"td-vocab-title--Thing","null","", -"td-vocab-titles--DataSchema","null","titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages) of the interaction pattern. MAY be included. Type: MultiLanguage.", -"td-vocab-titles--InteractionAffordance","null","titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages) of the interaction pattern. MAY be included. Type: MultiLanguage.", -"td-vocab-titles--Thing","null","titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages). MAY be included. Type: MultiLanguage.", -"td-vocab-token--OAuth2SecurityScheme","null","token: URI of the token server. MAY be included. Type: anyURI.", -"td-vocab-type--DataSchema","null","", -"td-vocab-type--DataSchema_array","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string array).", -"td-vocab-type--DataSchema_boolean","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string boolean).", -"td-vocab-type--DataSchema_integer","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string integer).", -"td-vocab-type--DataSchema_null","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string null).", -"td-vocab-type--DataSchema_number","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string number).", -"td-vocab-type--DataSchema_object","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string object).", -"td-vocab-type--DataSchema_string","null","type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string string).", -"td-vocab-type--Link","null","Provides a hint indicating what the media type [MEDIATYPES] of the result of dereferencing the link should be.", -"td-vocab-unit--DataSchema","null","unit: Provides unit information that is used, e.g., in international science, engineering, and business. MAY be included. Type: string.", -"td-vocab-uriVariables--InteractionAffordance","null","uriVariables: Define URI template variables as collection based on DataSchema declarations.", -"td-vocab-uriVariables--Thing","null","forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form.", -"td-vocab-version--Thing","null","The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces.", -"td-vocab-writeOnly--DataSchema","null","writeOnly: Boolean value that indicates whether a property interaction / value is write only (=true) or not (=false). MUST be included. Type: boolean.", -"tm-compose-name-collision","null","", -"tm-rel-type-maximum","null","", -"well-known-operation-types-only","null","", -"tm-compose-instanceName","null","", -"tm-compose-submodel","null","", -"tm-context-requirement","null","", -"tm-extend","null","", -"tm-identification","null","", -"tm-placeholder","null","", -"tm-placeholder-retyping","null","", -"tm-placeholder-usecase","null","", -"tm-placeholder-value","null","", -"tm-protocol-security-restriction","null","", -"tm-td-generation-inconsistencies","null","", -"tm-tmOptional","null","", -"tm-tmOptional-JSONPointer","null","", -"tm-tmOptional-array","null","", -"tm-tmRef-usecase","null","", -"tm-tmRef1","null","", -"tm-versioning-2","null","", \ No newline at end of file +"ID","Status","Comment","Description" +"privacy-distributed-ids","null",,"TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness." +"privacy-id-metadata","null",,"TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness." +"sec-body-name-json-pointer","null",,"When used in the context of a body security information location, the value of name MUST be in the form of a JSON pointer [[!RFC6901]] relative to the root of the input DataSchema for each interaction it is used with." +"sec-body-name-json-pointer-array","null",,"The JSON pointer used in the body locator MAY use the - character to indicate a non-existent array element when it is necessary to insert an element after the last element of an existing array" +"sec-security-vocab-auto-in-no-name","null",,"" +"sec-vuln-auto","null",,"" +"td-action-arrays","null",,"The type of the members forms MUST be serialized as a JSON array." +"td-action-names","null",,"" +"td-action-names_at-type","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-names_description","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-names_descriptions","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-names_forms","null",,"The type of the members forms MUST be serialized as a JSON array." +"td-action-names_idempotent","null",,"" +"td-action-names_input","null",,"" +"td-action-names_output","null",,"" +"td-action-names_safe","null",,"" +"td-action-names_title","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-names_titles","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-names_uriVariables","null",,"Each optional vocabulary term as defined in the class Action and its superclass InteractionPattern MUST be serialized as a JSON name within an Action object." +"td-action-objects","null",,"" +"td-action-objects_input","null",,"" +"td-action-objects_output","null",,"" +"td-actions","null",,"" +"td-actions_existence","null",,"Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)" +"td-actions_uniqueness","null",,"" +"td-additionalExpectedResponse-contentType","null",,"" +"td-additionalExpectedResponse-schema","null",,"" +"td-array-type","null",,"" +"td-arrays","null",,"" +"td-arrays_forms","null",,"" +"td-arrays_links","null",,"Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name." +"td-boolean-type","null",,"" +"td-class-type","null",,"" +"td-context","null",,"The root element of a TD Serialization MUST be a JSON object that includes a member with the name @context and a value of type string or array that equals or respectively contains https://www.w3.org/2022/wot/td/v1.1." +"td-context-default-language","null",,"schema" +"td-context-ns-td10-namespace","null",,"When there are possibly TD 1.0 consumers the anyURI https://www.w3.org/2019/wot/td/v1 MUST be the first entry and the https://www.w3.org/2022/wot/td/v1.1 MUST be the second entry." +"td-context-ns-thing-mandatory","null",,"" +"td-context-ns-thing-map-of-namespaces","null",,"schema" +"td-context-ns-thing-optional","null",,"schema" +"td-context-toplevel","null",,"" +"td-data-schema","null",,"" +"td-data-schema-arrays","null",,"" +"td-data-schema-arrays_enum","null",,"" +"td-data-schema-arrays_oneOf","null",,"" +"td-data-schema-arrays_required","null",,"" +"td-data-schema-objects","null",,"" +"td-data-schema-objects-arrays","null",,"" +"td-data-schema_at-type","null",,"" +"td-data-schema_const","null",,"" +"td-data-schema_contentEncoding","null",,"" +"td-data-schema_contentMediaType","null",,"" +"td-data-schema_description","null",,"" +"td-data-schema_descriptions","null",,"" +"td-data-schema_enum","null",,"" +"td-data-schema_exclusiveMaximum-IntegerSchema","null",,"" +"td-data-schema_exclusiveMaximum-NumberSchema","null",,"" +"td-data-schema_exclusiveMinimum-IntegerSchema","null",,"" +"td-data-schema_exclusiveMinimum-NumberSchema","null",,"" +"td-data-schema_format","null",,"" +"td-data-schema_items","null",,"" +"td-data-schema_maxItems","null",,"" +"td-data-schema_maxLength","null",,"" +"td-data-schema_maximum-IntegerSchema","null",,"" +"td-data-schema_maximum-NumberSchema","null",,"" +"td-data-schema_minItems","null",,"" +"td-data-schema_minLength","null",,"" +"td-data-schema_minimum-IntegerSchema","null",,"" +"td-data-schema_minimum-NumberSchema","null",,"" +"td-data-schema_multipleOf-IntegerSchema","null",,"" +"td-data-schema_multipleOf-NumberSchema","null",,"" +"td-data-schema_oneOf","null",,"" +"td-data-schema_pattern","null",,"" +"td-data-schema_properties","null",,"" +"td-data-schema_readOnly","null",,"" +"td-data-schema_required","null",,"" +"td-data-schema_title","null",,"" +"td-data-schema_titles","null",,"" +"td-data-schema_type","null",,"" +"td-data-schema_unit","null",,"" +"td-data-schema_writeOnly","null",,"" +"td-datetime-recommended-type","null",,"" +"td-datetime-type","null",,"" +"td-event-arrays","null",,"The type of the members forms MUST be serialized as a JSON array." +"td-event-names","null",,"" +"td-event-names_at-type","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-names_cancellation","null",,"" +"td-event-names_data","null",,"" +"td-event-names_dataResponse","null",,"" +"td-event-names_description","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-names_descriptions","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-names_forms","null",,"The type of the members forms MUST be serialized as a JSON array." +"td-event-names_subscription","null",,"" +"td-event-names_title","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-names_titles","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-names_uriVariables","null",,"Each optional vocabulary term as defined in the class Event, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within an Event object." +"td-event-objects","null",,"" +"td-event-objects_cancellation","null",,"" +"td-event-objects_data","null",,"" +"td-event-objects_dataResponse","null",,"" +"td-event-objects_subscription","null",,"" +"td-events","null",,"" +"td-events_existence","null",,"Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)" +"td-events_uniqueness","null",,"" +"td-expectedResponse-contentType","null",,"" +"td-form-response-object","null",,"" +"td-format-validation-known-values","null",,"" +"td-forms","null",,"" +"td-forms-response","null",,"" +"td-integer-type","null",,"" +"td-json-open","null",,"" +"td-json-open_utf-8","null",,"" +"td-links","null",,"Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name." +"td-map-type","null",,"" +"td-multi-languages","null",,"" +"td-multi-languages-consistent","null",,"" +"td-multi-languages_descriptions","null",,"" +"td-multi-languages_titles","null",,"" +"td-multilanguage-language-tag","null",,"" +"td-multilanguage-value","null",,"" +"td-number-type","null",,"" +"td-objects","null",,"" +"td-objects_actions","null",,"Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)" +"td-objects_descriptions","null",,"" +"td-objects_events","null",,"Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)" +"td-objects_properties","null",,"Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)" +"td-objects_schemaDefinitions","null",,"schemaDefinitions: Set of named data schemas. To be used in a schema name-value pair inside an AdditionalExpectedResponse object. MAY be included. Type: Map of DataSchema." +"td-objects_securityDefinitions","null",,"" +"td-objects_uriVariables","null",,"" +"td-objects_version","null",,"The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces." +"td-op-for-action","null",,"When a forms term member is present in an Action instance, the value(s) of op in the forms MUST be invokeaction." +"td-op-for-event","null",,"When a forms term member is present in an Event instance, the value(s) of op in the forms MUST be one of subscribeevent or unsubscribeevent." +"td-op-for-property","null",,"When a forms term member is present in a Property instance, the value(s) of op in the forms MUST be one of readproperty, writeproperty or observeproperty." +"td-op-for-thing","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-processor","null",,"" +"td-properties","null",,"" +"td-properties_existence","null",,"Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)" +"td-properties_uniqueness","null",,"" +"td-property-arrays","null",,"The type of the member forms MUST be serialized as a JSON array." +"td-property-names","null",,"" +"td-property-names_at-type","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_const","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_contentEncoding","null",,"" +"td-property-names_contentMediaType","null",,"" +"td-property-names_description","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_descriptions","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_enum","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_exclusiveMaximum","null",,"" +"td-property-names_exclusiveMinimum","null",,"" +"td-property-names_format","null",,"" +"td-property-names_forms","null",,"" +"td-property-names_items","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_maxItems","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_maxLength","null",,"" +"td-property-names_maximum","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_minItems","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_minLength","null",,"" +"td-property-names_minimum","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_multipleOf","null",,"" +"td-property-names_observable","null",,"" +"td-property-names_oneOf","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_properties","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_readOnly","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_required","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_title","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_titles","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_type","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_unit","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_uriVariables","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-property-names_writeOnly","null",,"Each mandatory and optional vocabulary term as defined in the class Property, as well as its two superclasses InteractionPattern and DataSchema, MUST be serialized as a JSON name within a Property object. This means that at the level of an interaction property instance, the vocabulary terms of InteractionPattern and DataSchema can be presented at the same time." +"td-security","null",,"" +"td-security-activation","null",,"" +"td-security-bearer-format-extensions","null",,"" +"td-security-bearer-format-extensions_alg","null",,"alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string." +"td-security-bearer-format-extensions_format","null",,"alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string." +"td-security-binding","null",,"" +"td-security-combo-deprecation","null",,"" +"td-security-combo-exclusive-oneof-or-allof","null",,"Exactly one of either oneOf or allOf MUST be included." +"td-security-in-query-over-uri","null",,"The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable." +"td-security-in-uri-variable","null",,"" +"td-security-mandatory","null",,"" +"td-security-oauth2-client-flow","null",,"For the client flow token MUST be included." +"td-security-oauth2-client-flow-no-auth","null",,"" +"td-security-oauth2-code-flow","null",,"For the code flow both authorization and token MUST be included." +"td-security-oauth2-device-flow","null",,"For the device flow both authorization and token MUST be included." +"td-security-overrides","null",,"" +"td-security-scheme-name","null",,"" +"td-security-schemes","null",,"" +"td-security-uri-variables-distinct","null",,"" +"td-string-type","null",,"" +"td-text-at-direction","null",,"The root element of a TD Serialization MUST be a JSON object that includes a member with the name @context and a value of type string or array that equals or respectively contains https://www.w3.org/2022/wot/td/v1.1." +"td-title-description","null",,"" +"td-title-description_descriptions","null",,"If title and titles description and descriptions are defined at the same time at the JSON level, title and description MAY be seen as default text." +"td-title-description_titles","null",,"If title and titles description and descriptions are defined at the same time at the JSON level, title and description MAY be seen as default text." +"td-titles-descriptions","null",,"" +"td-uriVariables-dataschema","null",,"" +"td-uriVariables-names","null",,"" +"td-version","null",,"The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces." +"td-vocab-actions--Thing","null",,"Actions offered by a Thing MUST be collected in the JSON-object based actions member with (unique) Action names as JSON names.(Checking their existence)" +"td-vocab-additionalResponses--Form","null",,"additionalResponses: This optional term can be used if additional expected responses are possible, e.g. for error reporting. Each additional response needs to be distinguished from others in some way (for example, by specifying a protocol-specific error code), and may also have its own data schema. MAY be included. Type: AdditionalExpectedResponse or Array of AdditionalExpectedResponse." +"td-vocab-alg--BearerSecurityScheme","null",,"alg: Encoding, encryption, or digest algorithm (one of MD5, ES256, or ES512-256). MUST be included. Type: string." +"td-vocab-allOf--ComboSecurityScheme","null",,"allOf: Array of two or more strings identifying other named security scheme definitions, all of which must be satisfied for access. MUST be included. Type: string or Array of string." +"td-vocab-anchor--Link","null",,"anchor: By default, the context of a link is the URL of the representation it is associated with, and is serialised as a URI. When present, the anchor parameter overrides this with another URI, such as a fragment of this resource, or a third resource (i.e., when the anchor value is an absolute URI)." +"td-vocab-at-context--Thing","null",,"" +"td-vocab-at-type--DataSchema","null",,"@type: Known from JSON-LD [[!json-ld]], @type is used to state that values described by the DataSchema are instances of a class. Each string in the value array represents a class. MAY be included. Type: array of string." +"td-vocab-at-type--InteractionAffordance","null",,"@type: Known from JSON-LD [[!json-ld]], @type is used to state that an interaction resource is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string." +"td-vocab-at-type--SecurityScheme","null",,"@type: Known from JSON-LD [[!json-ld]], @type is used to state that a security mechanism configured by the SecurityScheme is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string." +"td-vocab-at-type--Thing","null",,"@type: Known from JSON-LD [[!json-ld]], @type is used to state that a thing resource is an instance of a class. Each string in the value array represents a class. MAY be included. Type: array of string." +"td-vocab-authorization--BearerSecurityScheme","null",,"authorization: URI of the authorization server. MAY be included. Type: anyURI." +"td-vocab-authorization--OAuth2SecurityScheme","null",,"authorization: URI of the authorization server. MAY be included. Type: anyURI." +"td-vocab-base--Thing","null",,"base: Define the base URI that is valid for all defined local interaction resources. All other URIs in the TD must then be resolved using the algorithm defined in [[!RFC3986]]." +"td-vocab-cancellation--EventAffordance","null",,"cancellation: Defines any data that needs to be passed to cancel a subscription, e.g., a specific message to remove a Webhook." +"td-vocab-const--DataSchema","null",,"const: Provides a constant value. MAY be included. Type: any type." +"td-vocab-contentCoding--Form","null",,"contentCoding: Content coding values indicate an encoding transformation that has been or can be applied to a representation. Content codings are primarily used to allow a representation to be compressed or otherwise usefully transformed without losing the identity of its underlying media type and without loss of information." +"td-vocab-contentEncoding--StringSchema","null",,"contentEncoding: Specifies the encoding used to store the contents" +"td-vocab-contentMediaType--StringSchema","null",,"contentMediaType: Specifies the MIME type (e.g., image/png, audio/mpeg) of the contents of a string value, as described in RFC 2046. MAY be included. Type: string." +"td-vocab-contentType--AdditionalExpectedResponse","null",,"contentType: Assign a content type based on a media type (e.g., text/plain) and potential parameters (e.g., charset=utf-8) for the media type [RFC2046]. MAY be included. Type: string." +"td-vocab-contentType--ExpectedResponse","null",,"" +"td-vocab-contentType--Form","null",,"contentType: Assign a content type based on a media type [[!MEDIATYPES]] (e.g., 'application/json) and (optional) parameters (e.g., 'charset=utf-8')." +"td-vocab-created--Thing","null",,"created: Provides information when the TD instance was created." +"td-vocab-data--EventAffordance","null",,"data: Defines the data schema of the Event instance messages pushed by the Thing." +"td-vocab-dataResponse--EventAffordance","null",,"dataResponse: Defines the data schema of the Event response messages sent be the consumer in a response to a data message." +"td-vocab-default--DataSchema","null",,"default: Supply a default value. The value should validate against the data schema in which it resides. MAY be included. Type: any type." +"td-vocab-description--DataSchema","null",,"description: Provides additional (human-readable) information based on a default language. MAY be included. Type: string." +"td-vocab-description--InteractionAffordance","null",,"description: Provides additional (human-readable) information based on a default language. MAY be included. Type: string." +"td-vocab-description--SecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-description--Thing","null",,"" +"td-vocab-descriptions--DataSchema","null",,"descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage." +"td-vocab-descriptions--InteractionAffordance","null",,"descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage." +"td-vocab-descriptions--SecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-descriptions--Thing","null",,"descriptions: Can be used to support (human-readable) information in different languages. MAY be included. Type: MultiLanguage." +"td-vocab-enum--DataSchema","null",,"enum: Restricted set of values provided as an array." +"td-vocab-events--Thing","null",,"Events offered by a Thing MUST be collected in the JSON-object based events member with (unique) Event names as JSON names. (Checking if they exist)" +"td-vocab-exclusiveMaximum--IntegerSchema","null",,"exclusiveMaximum: Specifies a maximum numeric value, representing an exclusive upper limit. Only applicable for associated number or integer types. MAY be included. Type: integer." +"td-vocab-exclusiveMaximum--NumberSchema","null",,"exclusiveMaximum: Specifies a maximum numeric value, representing an exclusive upper limit. Only applicable for associated number or integer types. MAY be included. Type: double." +"td-vocab-exclusiveMinimum--IntegerSchema","null",,"exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: integer." +"td-vocab-exclusiveMinimum--NumberSchema","null",,"exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double." +"td-vocab-flow--OAuth2SecurityScheme","null",,"For the code flow both authorization and token MUST be included." +"td-vocab-format--BearerSecurityScheme","null",,"format: Specifies format of security authentication information (one of jwt, jwe, or jws). MUST be included. Type: string." +"td-vocab-format--DataSchema","null",,"format: Defines format pattern validation on certain kinds of string values. It is open to use pattern values that may originate from JSON schema presets (e.g., date/time, email, URL) or other (customer-based) definitions. . MAY be included. Type: string." +"td-vocab-forms--InteractionAffordance","null",,"forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. MUST be included. Type: array of Form." +"td-vocab-forms--Thing","null",,"forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form." +"td-vocab-href--Form","null",,"" +"td-vocab-href--Link","null",,"Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name." +"td-vocab-hreflang--Link","null",,"anchor: By default, the context of a link is the URL of the representation it is associated with, and is serialised as a URI. When present, the anchor parameter overrides this with another URI, such as a fragment of this resource, or a third resource (i.e., when the anchor value is an absolute URI)." +"td-vocab-id--Thing","null",,"" +"td-vocab-idempotent--ActionAffordance","null",,"idempotent: Indicates whether the action is idempotent (=true) or not. Informs whether the action can be called repeatedly with the same result, if present, based on the same input." +"td-vocab-identity--PSKSecurityScheme","null",,"identity: Pre-shared key identity. MAY be included. Type: string." +"td-vocab-in--APIKeySecurityScheme","null",,"in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string." +"td-vocab-in--BasicSecurityScheme","null",,"in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string." +"td-vocab-in--BearerSecurityScheme","null",,"in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string." +"td-vocab-in--DigestSecurityScheme","null",,"in: Specifies the location of security authentication information (one of header, query, body, or cookie). MUST be included. Type: string." +"td-vocab-input--ActionAffordance","null",,"input: Used to define the input data schema of the action." +"td-vocab-instance--VersionInfo","null",,"The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces." +"td-vocab-items--ArraySchema","null",,"items: Used to define the characteristics of an array. MAY be included. Type: DataSchema." +"td-vocab-links--Thing","null",,"Each mandatory and optional vocabulary term as defined in the class Link, MUST be serialized as a JSON name." +"td-vocab-maxItems--ArraySchema","null",,"maxItems: Defines the maximum number of items that have to be in the array. MAY be included. Type: unsignedInt." +"td-vocab-maxLength--StringSchema","null",,"maxLength: Specifies the maximum length of a string. Only applicable for associated string types. MAY be included. Type: unsignedInt." +"td-vocab-maximum--IntegerSchema","null",,"maximum: Specifies a maximum numeric value. Only applicable for associated number or integer types. MAY be included. Type: integer." +"td-vocab-maximum--NumberSchema","null",,"maximum: Specifies a maximum numeric value. Only applicable for associated number or integer types. MAY be included. Type: double." +"td-vocab-minItems--ArraySchema","null",,"minItems: Defines the minimum number of items that have to be in the array. MAY be included. Type: unsignedInt." +"td-vocab-minLength--StringSchema","null",,"minLength: Specifies the minimum length of a string. Only applicable for associated string types. MAY be included. Type: unsignedInt." +"td-vocab-minimum--IntegerSchema","null",,"minimum: Specifies a minimum numeric value. Only applicable for associated number or integer types. MAY be included. Type: integer." +"td-vocab-minimum--NumberSchema","null",,"minimum: Specifies a minimum numeric value. Only applicable for associated number or integer types. MAY be included. Type: double." +"td-vocab-model--VersionInfo","null",,"model: Provides a version indicator of the underlying TM. instance. MAY be included. Type: string." +"td-vocab-modified--Thing","null",,"modified: Provides information when the TD instance was last modified." +"td-vocab-multipleOf--IntegerSchema","null",,"multipleOf: Specifies the multipleOf value number. The value must strictly greater than 0. Only applicable for associated number or integer types. MAY be included. Type: integer." +"td-vocab-multipleOf--NumberSchema","null",,"exclusiveMinimum: Specifies a minimum numeric value, representing an exclusive lower limit. Only applicable for associated number or integer types. MAY be included. Type: double." +"td-vocab-name--APIKeySecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-name--BasicSecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-name--BearerSecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-name--DigestSecurityScheme","null",,"name: Name for query, header, or cookie parameters. MAY be included. Type: string." +"td-vocab-observable--PropertyAffordance","null",,") the Property, to receive change notifications or periodic updates (true/false)." +"td-vocab-oneOf--ComboSecurityScheme","null",,"oneOf: Array of two or more strings identifying other named security scheme definitions, any one of which, when satisfied, will allow access. Only one may be chosen for use. MUST be included. Type: string or Array of string." +"td-vocab-oneOf--DataSchema","null",,"oneOf: Used to ensure that the data is valid against one of the specified schemas in the array. MAY be included. Type: array of DataSchema." +"td-vocab-op--Form","null",,"" +"td-vocab-op--Form_cancelaction","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_invokeaction","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_observeallproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_observeproperty","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_queryaction","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_queryallactions","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_readallproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_readmultipleproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readmultipleproperties." +"td-vocab-op--Form_readproperty","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_subscribeallevents","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_subscribeevent","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_unobserveallproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_unobserveproperty","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_unsubscribeallevents","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_unsubscribeevent","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-op--Form_writeallproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of readallproperties, writeallproperties, readmultipleproperties or writemultipleproperties." +"td-vocab-op--Form_writemultipleproperties","null",,"When a forms term member is present in a Thing instance, the value(s) of op in the forms MUST be one of writemultipleproperties." +"td-vocab-op--Form_writeproperty","null",,"op: Indicates the expected result of performing the operation described by the form. For example, the Property interaction allows get and set operations. The protocol binding may contain a form for the get operation and a different form for the set operation. The op attribute indicates which form is which and allows the client to select the correct form for the operation required." +"td-vocab-output--ActionAffordance","null",,"output: Used to define the output data schema of the action." +"td-vocab-pattern--StringSchema","null",,"pattern: Provides a regular expressions to express constraints of the string value. The regular expression must follow the [[ECMA-262]] dialect. MAY be included. Type: string." +"td-vocab-profile--Thing","null",,"profile: Indicates the WoT Profile mechanisms followed by this Thing Description and the corresponding Thing implementation. MAY be included. Type: anyURI or Array of anyURI." +"td-vocab-properties--ObjectSchema","null",,"properties: Data schema nested definitions. MAY be included. Type: DataSchema." +"td-vocab-properties--Thing","null",,"Properties (and sub-properties) offered by a Thing MUST be collected in the JSON-object based properties member with (unique) Property names as JSON names. (Checking their existence)" +"td-vocab-proxy--SecurityScheme","null",,"proxy: URI of the proxy server this security configuration provides access to. If not given, the corresponding security configuration is for the endpoint. MAY be included. Type: anyURI." +"td-vocab-qop--DigestSecurityScheme","null",,"qop: Quality of protection (one of auth or auth-int). MUST be included. Type: string." +"td-vocab-readOnly--DataSchema","null",,"readOnly: Boolean value that indicates whether a property interaction / value is read only (=true) or not (=false). MUST be included. Type: boolean." +"td-vocab-refresh--OAuth2SecurityScheme","null",,"refresh: URI of the refresh server. MAY be included. Type: anyURI." +"td-vocab-rel--Link","null",,"rel: Indicates the relation to an other Thing." +"td-vocab-required--ObjectSchema","null",,"required: Defines which members of the object type are mandatory. MAY be included. Type: array of string." +"td-vocab-response--Form","null",,"response: This optional term can be used if, e.g., the output communication metadata differ from input metdata (e.g., output contentType differ from the input contentType). The response name contains metadata that is only valid for the reponse messages." +"td-vocab-safe--ActionAffordance","null",,"safe: Signals if the action is safe (=true) or not. Used to signal if there is no internal state (cf. resource state) is changed when invoking an Action. In that case responses can be cached as example." +"td-vocab-schema--AdditionalExpectedResponse","null",,"success: Signals if an additional response should not be considered an error." +"td-vocab-schemaDefinitions--Thing","null",,"schemaDefinitions: Set of named data schemas. To be used in a schema name-value pair inside an AdditionalExpectedResponse object. MAY be included. Type: Map of DataSchema." +"td-vocab-scheme--SecurityScheme","null",,"" +"td-vocab-scheme--SecurityScheme_apikey","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string apikey." +"td-vocab-scheme--SecurityScheme_auto","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string auto." +"td-vocab-scheme--SecurityScheme_basic","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string basic." +"td-vocab-scheme--SecurityScheme_bearer","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string bearer." +"td-vocab-scheme--SecurityScheme_digest","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string digest." +"td-vocab-scheme--SecurityScheme_nosec","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string nosec." +"td-vocab-scheme--SecurityScheme_oauth2","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string oauth2." +"td-vocab-scheme--SecurityScheme_psk","null",,"scheme: Identification of security mechanism being configured. MUST be included. Type: string psk." +"td-vocab-scopes--Form","null",,"scopes: Set of authorization scope identifiers, provided as an array. These are provided in tokens returned by an authorization server and associated with forms in order to identify what resources a client may access and how." +"td-vocab-scopes--OAuth2SecurityScheme","null",,"scopes: Set of authorization scope identifiers, provided as an array. These are provided in tokens returned by an authorization server and associated with forms in order to identify what resources a client may access and how." +"td-vocab-security--Form","null",,"security: Set of security definition names, chosen from those defined in securityDefinitions. These must all be satisfied for access to resources at or below the current level, if not overridden at a lower level. MAY be included. Type: array of string." +"td-vocab-security--Thing","null",,"" +"td-vocab-securityDefinitions--Thing","null",,"" +"td-vocab-sizes--Link","null",,". The value pattern follows {Height}x{Width} (e.g." +"td-vocab-subprotocol--Form","null",,"subprotocol: Indicates the exact mechanism by which an interaction will be accomplished for a given protocol when there are multiple options. For example, for HTTP and Events, it indicates which of several available mechanisms should be used for asynchronous notifications such as long polling (longpoll), WebSub [websub] (websub), Server-Sent Events (sse) [html] (also known as EventSource). Please note that there is no restriction on the subprotocol selection and other mechanisms can also be announced by this subprotocol term." +"td-vocab-subscription--EventAffordance","null",,"subscription: Defines data that needs to be passed upon subscription, e.g., filters or message format for setting up Webhooks." +"td-vocab-success--AdditionalExpectedResponse","null",,"success: Signals if an additional response should not be considered an error." +"td-vocab-support--Thing","null",,"support: Provides information about the TD maintainer (e.g., author, link or telephone number to get support, etc)." +"td-vocab-synchronous--ActionAffordance","null",,"synchronous: Indicates whether the action is synchronous (=true) or not. A synchronous action means that the response of action contains all the information about the result of the action and no further querying about the status of the action is needed. Lack of this keyword means that no claim on the synchronicity of the action can be made. Type: boolean" +"td-vocab-title--DataSchema","null",,"title: Provides a human-readable title (e.g., display a text for UI representation) of the interaction pattern based on a default language. MAY be included. Type: string." +"td-vocab-title--InteractionAffordance","null",,"title: Provides a human-readable title (e.g., display a text for UI representation) of the interaction pattern based on a default language. MAY be included. Type: string." +"td-vocab-title--Thing","null",,"" +"td-vocab-titles--DataSchema","null",,"titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages) of the interaction pattern. MAY be included. Type: MultiLanguage." +"td-vocab-titles--InteractionAffordance","null",,"titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages) of the interaction pattern. MAY be included. Type: MultiLanguage." +"td-vocab-titles--Thing","null",,"titles: Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages). MAY be included. Type: MultiLanguage." +"td-vocab-token--OAuth2SecurityScheme","null",,"token: URI of the token server. MAY be included. Type: anyURI." +"td-vocab-type--DataSchema","null",,"" +"td-vocab-type--DataSchema_array","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string array)." +"td-vocab-type--DataSchema_boolean","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string boolean)." +"td-vocab-type--DataSchema_integer","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string integer)." +"td-vocab-type--DataSchema_null","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string null)." +"td-vocab-type--DataSchema_number","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string number)." +"td-vocab-type--DataSchema_object","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string object)." +"td-vocab-type--DataSchema_string","null",,"type: Assignment of JSON-based data types compatible with JSON Schema (one of boolean, integer, number, string, object, array, or null). MAY be included. Type: string string)." +"td-vocab-type--Link","null",,"Provides a hint indicating what the media type [MEDIATYPES] of the result of dereferencing the link should be." +"td-vocab-unit--DataSchema","null",,"unit: Provides unit information that is used, e.g., in international science, engineering, and business. MAY be included. Type: string." +"td-vocab-uriVariables--InteractionAffordance","null",,"uriVariables: Define URI template variables as collection based on DataSchema declarations." +"td-vocab-uriVariables--Thing","null",,"forms: Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's Property interaction resources collectively at once. MAY be included. Type: array of Form." +"td-vocab-version--Thing","null",,"The version container MAY be used to provide additional application and/or device specific version information based on terms from non-TD namespaces." +"td-vocab-writeOnly--DataSchema","null",,"writeOnly: Boolean value that indicates whether a property interaction / value is write only (=true) or not (=false). MUST be included. Type: boolean." +"tm-compose-name-collision","null",,"" +"tm-rel-type-maximum","null",,"" +"well-known-operation-types-only","null",,"" +"tm-compose-instanceName","null",,"" +"tm-compose-submodel","null",,"" +"tm-context-requirement","null",,"" +"tm-extend","null",,"" +"tm-identification","null",,"" +"tm-placeholder","null",,"" +"tm-placeholder-retyping","null",,"" +"tm-placeholder-usecase","null",,"" +"tm-placeholder-value","null",,"" +"tm-protocol-security-restriction","null",,"" +"tm-td-generation-inconsistencies","null",,"" +"tm-tmOptional","null",,"" +"tm-tmOptional-JSONPointer","null",,"" +"tm-tmOptional-array","null",,"" +"tm-tmRef-usecase","null",,"" +"tm-tmRef1","null",,"" +"tm-versioning-2","null",,"" \ No newline at end of file diff --git a/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv b/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv index a26472452..7796ea540 100644 --- a/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv +++ b/packages/assertions/assertions-csv/manual-generation-inputs/pre-implemented.csv @@ -1,4 +1,4 @@ -"ID","Status","Comment","Assertion" +"ID","Status","Comment","Description" "privacy-distributed-ids","not-impl","data/id must match pattern ""^(urn:uuid:)[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}""","TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness." "privacy-id-metadata","not-impl","data/id must match pattern ""^(urn:uuid:)[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}""","TD identifiers SHOULD be generated using a distributed mechanism such as UUIDs that provides a high probability of uniqueness." "sec-body-name-json-pointer","not-impl",,"When used in the context of a body security information location, the value of name MUST be in the form of a JSON pointer [[!RFC6901]] relative to the root of the input DataSchema for each interaction it is used with." @@ -351,55 +351,55 @@ "tm-compose-name-collision","not-impl",, "tm-rel-type-maximum","not-impl","no links array in the td", "well-known-operation-types-only","not-impl","result of a merge", -"bindings-requirements-scheme","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding indicated by the URI scheme of its href member." -"bindings-server-accept","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction." -"client-data-schema","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another target Thing described in a WoT Thing Description MUST generate data organized according to the data schemas given in the corresponding interactions." -"client-data-schema-accept-extras","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST accept without error any additional data not described in the data schemas given in the Thing Description of the target Thing." -"client-data-schema-no-extras","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST NOT generate data not described in the data schemas given in the Thing Description of that Thing." -"client-uri-template","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST generate URIs according to the URI Templates, base URIs, and form href parameters given in the Thing Description of the target Thing." -"sec-body-name-json-pointer-creatable","null","not testable with Assertion Tester","When an element of a data schema indicated by a JSON pointer indicated in a body locator does not already exist in the indicated schema, it MUST be possible to insert the indicated element at the location indicated by the pointer." -"server-data-schema","null","not testable with Assertion Tester","A WoT Thing Description MUST accurately describe the data returned and accepted by each interaction." -"server-data-schema-extras","null","not testable with Assertion Tester","A Thing MAY return additional data from an interaction even when such data is not described in the data schemas given in its WoT Thing Description." -"server-uri-template","null","not testable with Assertion Tester","URI Templates, base URIs, and href members in a WoT Thing Description MUST accurately describe the WoT Interface of the Thing." -"td-context-default-language-direction-independence","null","not testable with Assertion Tester","However, when interpreting human-readable text, each human-readable string value MUST be processed independently." -"td-default-alg","null","not testable with Assertion Tester","The value associated with member alg if not given MUST be assumed to have the default value ES256." -"td-default-contentType","null","not testable with Assertion Tester","The value associated with member contentType if not given MUST be assumed to have the default value application/json." -"td-default-format","null","not testable with Assertion Tester","The value associated with member format if not given MUST be assumed to have the default value jwt." -"td-default-http-method","null","not testable with Assertion Tester","When no method is indicated in a form representing an Protocol Binding based on HTTP, a Default Value MUST be assumed as shown in the following table." -"td-default-http-method_get","null","not testable with Assertion Tester","The value associated with member GET if not given MUST be assumed to have the default value Form with operation type readproperty" -"td-default-http-method_post","null","not testable with Assertion Tester","The value associated with member POST if not given MUST be assumed to have the default value Form with operation type invokeaction." -"td-default-http-method_put","null","not testable with Assertion Tester","The value associated with member PUT if not given MUST be assumed to have the default value Form with operation type writeproperty." -"td-default-idempotent","null","not testable with Assertion Tester","The value associated with member idempotent if not given MUST be assumed to have the default value false." -"td-default-in-apikey","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value query." -"td-default-in-basic","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-in-bearer","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-in-digest","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-op-actions","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value invokeaction." -"td-default-op-events","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value subscribeevent." -"td-default-op-properties","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value Array of string with the elements readproperty and writeproperty." -"td-default-qop","null","not testable with Assertion Tester","The value associated with member qop if not given MUST be assumed to have the default value auth." -"td-default-readOnly","null","not testable with Assertion Tester","The value associated with member readOnly if not given MUST be assumed to have the default value false." -"td-default-safe","null","not testable with Assertion Tester","The value associated with member safe if not given MUST be assumed to have the default value false." -"td-default-success","null","not testable with Assertion Tester","." -"td-default-writeOnly","null","not testable with Assertion Tester","The value associated with member writeOnly if not given MUST be assumed to have the default value false." -"td-expectedResponse-contentType","null","not testable with Assertion Tester","If the content type of the expected response differs from the content type of the form, the Form instance MUST include a name-value pair with the name response." -"td-expectedResponse-default-contentType","null","not testable with Assertion Tester","If no response name-value pair is provided, it MUST be assumed that the content type of the response is equal to the content type assigned to the Form instance." -"td-form-protocolbindings","null","not testable with Assertion Tester","If required, form objects MAY be supplemented with protocol-specific Vocabulary Terms identified with a prefix." -"td-format-validation-other-values","null","not testable with Assertion Tester","When a value that is not found in the known set of values is assigned to format, such a validation SHOULD succeed." -"td-json-open","null","not testable with Assertion Tester","TDs MUST be serialized according to the requirements defined in Section 8.1 of RFC8259 for open ecosystems." -"td-json-open_accept-byte-order","null","not testable with Assertion Tester","TD Processors MAY ignore the presence of a byte order mark rather than treating it as an error." -"td-json-open_no-byte-order","null","not testable with Assertion Tester","Implementations MUST NOT add a byte order mark (U+FEFF) to the beginning of a TD document." -"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester","In cases where the default language has been negotiated, an @language member MUST be present to indicate the result of the negotiation and the corresponding default language of the returned content." -"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester","When the default language has been negotiated successfully, TD documents SHOULD include the appropriate matching values for the members title and description in preference to MultiLanguage objects in titles and descriptions members." -"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester","Note however that Things MAY choose to not support such dynamically-generated TDs nor to support language negotiation (e.g., because of resource constraints)." -"td-processor-serialization","null","not testable with Assertion Tester","A TD Processor MUST be able to serialize Thing Descriptions into the JSON format and/or deserialize Thing Descriptions from that format, according to the rules noted in and." -"td-security-binding","null","not testable with Assertion Tester","If a Thing requires a specific access mechanism for an interaction, that mechanism MUST be specified in the security configuration of the Thing Description." -"td-security-in-query-over-uri","null","not testable with Assertion Tester","The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable." -"td-security-no-extras","null","not testable with Assertion Tester","If a Thing does not require a specific access mechanism for an interaction, that mechanism MUST NOT be specified in the security configuration of the Thing Description." -"td-security-no-secrets","null","not testable with Assertion Tester","For all security schemes, any private keys, passwords, or other sensitive information directly providing access should be shared and stored out-of-band and MUST NOT be stored in the TD." -"td-vocabulary-defaults","null","not testable with Assertion Tester","When assignments in a TD are missing, a TD Processor MUST follow the Default Value assignments expressed in the table of." -"well-known-operation-types-only","null","not testable with Assertion Tester","operations types SHOULD NOT be arbitrarily set by servients." -"ID","Status","Comment","Assertion" +"bindings-requirements-scheme","null","not testable with Assertion Tester", +"bindings-server-accept","null","not testable with Assertion Tester", +"client-data-schema","null","not testable with Assertion Tester", +"client-data-schema-accept-extras","null","not testable with Assertion Tester", +"client-data-schema-no-extras","null","not testable with Assertion Tester", +"client-uri-template","null","not testable with Assertion Tester", +"sec-body-name-json-pointer-creatable","null","not testable with Assertion Tester", +"server-data-schema","null","not testable with Assertion Tester", +"server-data-schema-extras","null","not testable with Assertion Tester", +"server-uri-template","null","not testable with Assertion Tester", +"td-context-default-language-direction-independence","null","not testable with Assertion Tester", +"td-default-alg","null","not testable with Assertion Tester", +"td-default-contentType","null","not testable with Assertion Tester", +"td-default-format","null","not testable with Assertion Tester", +"td-default-http-method","null","not testable with Assertion Tester", +"td-default-http-method_get","null","not testable with Assertion Tester", +"td-default-http-method_post","null","not testable with Assertion Tester", +"td-default-http-method_put","null","not testable with Assertion Tester", +"td-default-idempotent","null","not testable with Assertion Tester", +"td-default-in-apikey","null","not testable with Assertion Tester", +"td-default-in-basic","null","not testable with Assertion Tester", +"td-default-in-bearer","null","not testable with Assertion Tester", +"td-default-in-digest","null","not testable with Assertion Tester", +"td-default-op-actions","null","not testable with Assertion Tester", +"td-default-op-events","null","not testable with Assertion Tester", +"td-default-op-properties","null","not testable with Assertion Tester", +"td-default-qop","null","not testable with Assertion Tester", +"td-default-readOnly","null","not testable with Assertion Tester", +"td-default-safe","null","not testable with Assertion Tester", +"td-default-success","null","not testable with Assertion Tester", +"td-default-writeOnly","null","not testable with Assertion Tester", +"td-expectedResponse-contentType","null","not testable with Assertion Tester", +"td-expectedResponse-default-contentType","null","not testable with Assertion Tester", +"td-form-protocolbindings","null","not testable with Assertion Tester", +"td-format-validation-other-values","null","not testable with Assertion Tester", +"td-json-open","null","not testable with Assertion Tester", +"td-json-open_accept-byte-order","null","not testable with Assertion Tester", +"td-json-open_no-byte-order","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester", +"td-processor-serialization","null","not testable with Assertion Tester", +"td-security-binding","null","not testable with Assertion Tester", +"td-security-in-query-over-uri","null","not testable with Assertion Tester", +"td-security-no-extras","null","not testable with Assertion Tester", +"td-security-no-secrets","null","not testable with Assertion Tester", +"td-vocabulary-defaults","null","not testable with Assertion Tester", +"well-known-operation-types-only","null","not testable with Assertion Tester", +"ID","Status","Comment","Description" "tm-compose-instanceName","not-impl",, "tm-compose-submodel","not-impl",, "tm-context-requirement","pass",, diff --git a/packages/assertions/assertions-csv/manual.csv b/packages/assertions/assertions-csv/manual.csv index 7b433cd0d..de818748d 100644 --- a/packages/assertions/assertions-csv/manual.csv +++ b/packages/assertions/assertions-csv/manual.csv @@ -1,91 +1,91 @@ -"ID","Status","Assertion","Comment" -"bindings-requirements-scheme","null","Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding indicated by the URI scheme of its href member.", -"bindings-server-accept","null","Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction.", -"client-data-schema","null","A Thing acting as a Consumer when interacting with another target Thing described in a WoT Thing Description MUST generate data organized according to the data schemas given in the corresponding interactions.", -"client-data-schema-accept-extras","null","A Thing acting as a Consumer when interacting with another Thing MUST accept without error any additional data not described in the data schemas given in the Thing Description of the target Thing.", -"client-data-schema-no-extras","null","A Thing acting as a Consumer when interacting with another Thing MUST NOT generate data not described in the data schemas given in the Thing Description of that Thing.", -"client-uri-template","null","A Thing acting as a Consumer when interacting with another Thing MUST generate URIs according to the URI Templates, base URIs, and form href parameters given in the Thing Description of the target Thing.", -"sec-body-name-json-pointer-creatable","null","When an element of a data schema indicated by a JSON pointer indicated in a body locator does not already exist in the indicated schema, it MUST be possible to insert the indicated element at the location indicated by the pointer.", -"server-data-schema","null","A WoT Thing Description MUST accurately describe the data returned and accepted by each interaction.", -"server-data-schema-extras","null","A Thing MAY return additional data from an interaction even when such data is not described in the data schemas given in its WoT Thing Description.", -"server-uri-template","null","URI Templates, base URIs, and href members in a WoT Thing Description MUST accurately describe the WoT Interface of the Thing.", -"td-context-default-language-direction-independence","null","However, when interpreting human-readable text, each human-readable string value MUST be processed independently.", -"td-default-alg","null","The value associated with member alg if not given MUST be assumed to have the default value ES256.", -"td-default-contentType","null","The value associated with member contentType if not given MUST be assumed to have the default value application/json.", -"td-default-format","null","The value associated with member format if not given MUST be assumed to have the default value jwt.", -"td-default-http-method","null","When no method is indicated in a form representing an Protocol Binding based on HTTP, a Default Value MUST be assumed as shown in the following table.", -"td-default-http-method_get","null","The value associated with member GET if not given MUST be assumed to have the default value Form with operation type readproperty", -"td-default-http-method_post","null","The value associated with member POST if not given MUST be assumed to have the default value Form with operation type invokeaction.", -"td-default-http-method_put","null","The value associated with member PUT if not given MUST be assumed to have the default value Form with operation type writeproperty.", -"td-default-idempotent","null","The value associated with member idempotent if not given MUST be assumed to have the default value false.", -"td-default-in-apikey","null","The value associated with member in if not given MUST be assumed to have the default value query.", -"td-default-in-basic","null","The value associated with member in if not given MUST be assumed to have the default value header.", -"td-default-in-bearer","null","The value associated with member in if not given MUST be assumed to have the default value header.", -"td-default-in-digest","null","The value associated with member in if not given MUST be assumed to have the default value header.", -"td-default-op-actions","null","The value associated with member op if not given MUST be assumed to have the default value invokeaction.", -"td-default-op-events","null","The value associated with member op if not given MUST be assumed to have the default value subscribeevent.", -"td-default-op-properties","null","The value associated with member op if not given MUST be assumed to have the default value Array of string with the elements readproperty and writeproperty.", -"td-default-qop","null","The value associated with member qop if not given MUST be assumed to have the default value auth.", -"td-default-readOnly","null","The value associated with member readOnly if not given MUST be assumed to have the default value false.", -"td-default-safe","null","The value associated with member safe if not given MUST be assumed to have the default value false.", -"td-default-success","null",".", -"td-default-writeOnly","null","The value associated with member writeOnly if not given MUST be assumed to have the default value false.", -"td-expectedResponse-contentType","null","If the content type of the expected response differs from the content type of the form, the Form instance MUST include a name-value pair with the name response.", -"td-expectedResponse-default-contentType","null","If no response name-value pair is provided, it MUST be assumed that the content type of the response is equal to the content type assigned to the Form instance.", -"td-form-protocolbindings","null","If required, form objects MAY be supplemented with protocol-specific Vocabulary Terms identified with a prefix.", -"td-format-validation-other-values","null","When a value that is not found in the known set of values is assigned to format, such a validation SHOULD succeed.", -"td-json-open","null","TDs MUST be serialized according to the requirements defined in Section 8.1 of RFC8259 for open ecosystems.", -"td-json-open_accept-byte-order","null","TD Processors MAY ignore the presence of a byte order mark rather than treating it as an error.", -"td-json-open_no-byte-order","null","Implementations MUST NOT add a byte order mark (U+FEFF) to the beginning of a TD document.", -"td-ns-multilanguage-content-negotiation","null","In cases where the default language has been negotiated, an @language member MUST be present to indicate the result of the negotiation and the corresponding default language of the returned content.", -"td-ns-multilanguage-content-negotiation-no-multi","null","When the default language has been negotiated successfully, TD documents SHOULD include the appropriate matching values for the members title and description in preference to MultiLanguage objects in titles and descriptions members.", -"td-ns-multilanguage-content-negotiation-optional","null","Note however that Things MAY choose to not support such dynamically-generated TDs nor to support language negotiation (e.g., because of resource constraints).", -"td-processor-serialization","null","A TD Processor MUST be able to serialize Thing Descriptions into the JSON format and/or deserialize Thing Descriptions from that format, according to the rules noted in and.", -"td-security-binding","null","If a Thing requires a specific access mechanism for an interaction, that mechanism MUST be specified in the security configuration of the Thing Description.", -"td-security-in-query-over-uri","null","The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable.", -"td-security-no-extras","null","If a Thing does not require a specific access mechanism for an interaction, that mechanism MUST NOT be specified in the security configuration of the Thing Description.", -"td-security-no-secrets","null","For all security schemes, any private keys, passwords, or other sensitive information directly providing access should be shared and stored out-of-band and MUST NOT be stored in the TD.", -"td-vocabulary-defaults","null","When assignments in a TD are missing, a TD Processor MUST follow the Default Value assignments expressed in the table of.", -"well-known-operation-types-only","null","operations types SHOULD NOT be arbitrarily set by servients.", -"privacy-auth-users-only","null","Only authorized users SHOULD be provided access to the Thing Description for a Thing.","" -"privacy-centralized-ids","null","TD identifiers SHOULD NOT be generated using a centralized authority.","" -"privacy-essential-metadata-only","null","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD.","" -"privacy-immutable-id-as-property","null","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier.","" -"privacy-mutable-identifiers","null","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary.","" -"privacy-temp-id-metadata","null","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself.","" -"sec-body-name-json-pointer-type","null",".","" -"sec-inj-no-intl-markup","null","HTML markup SHOULD NOT be used for internationalization purposes in TD strings.","" -"security-context-secure-fetch","null","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given.","" -"security-jsonld-expansion","null","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing.","" -"security-mutual-auth-td","null","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels.","" -"security-no-execution","null","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed.","" -"security-oauth-limits","null","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access.","" -"security-remote-context","null","Constrained implementations SHOULD NOT follow links to remote contexts.","" -"security-server-auth-td","null","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated.","" -"security-static-context","null","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process.","" -"td-context-ns-td10-namespacev10","null","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification.","" -"td-default-AdditionalResponseContentType","null","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to.","" -"td-default-observable","null","PropertyAffordance observable false","" -"td-processor-bidi-isolation","null","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)","" -"td-producer-mixed-direction","null","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent.","" -"td-security-extension","null","Additional security schemes MUST be Subclasses of the Class SecurityScheme.","" -"td-text-direction-first-strong","null","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback.","" -"td-text-direction-language-tag","null","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings.","" -"thing-model-td-generation-processor-extends","null","If used","" -"thing-model-td-generation-processor-forms","null","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or .","" -"thing-model-td-generation-processor-imports","null","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to .","" -"thing-model-td-generation-processor-optional","null","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance.","" -"thing-model-td-generation-processor-placeholder","null","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD.","" -"thing-model-td-generation-processor-required","null","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance.","" -"thing-model-td-generation-processor-type","null","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance.","" -"tm-derivation-validity","null","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model.","" -"tm-overwrite-interaction","null","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model.","" -"tm-overwrite-types","null","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions.","" -"tm-placeholder-replacement","null","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model.","" -"tm-ref-recursive-extensions","null","Recursive extensions leading to an infinite loop MUST NOT be defined.","" -"tm-tmOptional-resolver","null","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition.","" -"tm-tmRef-overwrite-possibility","null","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value.","" -"tm-tmRef-overwrite-process","null","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs.","" -"tm-tmRef-overwrite-semantic-meaning","null","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition.","" -"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" -"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container.","" \ No newline at end of file +"ID","Status","Comment","Description" +"bindings-requirements-scheme","null","not testable with Assertion Tester", +"bindings-server-accept","null","not testable with Assertion Tester", +"client-data-schema","null","not testable with Assertion Tester", +"client-data-schema-accept-extras","null","not testable with Assertion Tester", +"client-data-schema-no-extras","null","not testable with Assertion Tester", +"client-uri-template","null","not testable with Assertion Tester", +"sec-body-name-json-pointer-creatable","null","not testable with Assertion Tester", +"server-data-schema","null","not testable with Assertion Tester", +"server-data-schema-extras","null","not testable with Assertion Tester", +"server-uri-template","null","not testable with Assertion Tester", +"td-context-default-language-direction-independence","null","not testable with Assertion Tester", +"td-default-alg","null","not testable with Assertion Tester", +"td-default-contentType","null","not testable with Assertion Tester", +"td-default-format","null","not testable with Assertion Tester", +"td-default-http-method","null","not testable with Assertion Tester", +"td-default-http-method_get","null","not testable with Assertion Tester", +"td-default-http-method_post","null","not testable with Assertion Tester", +"td-default-http-method_put","null","not testable with Assertion Tester", +"td-default-idempotent","null","not testable with Assertion Tester", +"td-default-in-apikey","null","not testable with Assertion Tester", +"td-default-in-basic","null","not testable with Assertion Tester", +"td-default-in-bearer","null","not testable with Assertion Tester", +"td-default-in-digest","null","not testable with Assertion Tester", +"td-default-op-actions","null","not testable with Assertion Tester", +"td-default-op-events","null","not testable with Assertion Tester", +"td-default-op-properties","null","not testable with Assertion Tester", +"td-default-qop","null","not testable with Assertion Tester", +"td-default-readOnly","null","not testable with Assertion Tester", +"td-default-safe","null","not testable with Assertion Tester", +"td-default-success","null","not testable with Assertion Tester", +"td-default-writeOnly","null","not testable with Assertion Tester", +"td-expectedResponse-contentType","null","not testable with Assertion Tester", +"td-expectedResponse-default-contentType","null","not testable with Assertion Tester", +"td-form-protocolbindings","null","not testable with Assertion Tester", +"td-format-validation-other-values","null","not testable with Assertion Tester", +"td-json-open","null","not testable with Assertion Tester", +"td-json-open_accept-byte-order","null","not testable with Assertion Tester", +"td-json-open_no-byte-order","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester", +"td-processor-serialization","null","not testable with Assertion Tester", +"td-security-binding","null","not testable with Assertion Tester", +"td-security-in-query-over-uri","null","not testable with Assertion Tester", +"td-security-no-extras","null","not testable with Assertion Tester", +"td-security-no-secrets","null","not testable with Assertion Tester", +"td-vocabulary-defaults","null","not testable with Assertion Tester", +"well-known-operation-types-only","null","not testable with Assertion Tester", +"privacy-auth-users-only","null","not testable with Assertion Tester","Only authorized users SHOULD be provided access to the Thing Description for a Thing." +"privacy-centralized-ids","null","not testable with Assertion Tester","TD identifiers SHOULD NOT be generated using a centralized authority." +"privacy-essential-metadata-only","null","not testable with Assertion Tester","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD." +"privacy-immutable-id-as-property","null","not testable with Assertion Tester","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier." +"privacy-mutable-identifiers","null","not testable with Assertion Tester","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary." +"privacy-temp-id-metadata","null","not testable with Assertion Tester","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself." +"sec-body-name-json-pointer-type","null","not testable with Assertion Tester","." +"sec-inj-no-intl-markup","null","not testable with Assertion Tester","HTML markup SHOULD NOT be used for internationalization purposes in TD strings." +"security-context-secure-fetch","null","not testable with Assertion Tester","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given." +"security-jsonld-expansion","null","not testable with Assertion Tester","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing." +"security-mutual-auth-td","null","not testable with Assertion Tester","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels." +"security-no-execution","null","not testable with Assertion Tester","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed." +"security-oauth-limits","null","not testable with Assertion Tester","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access." +"security-remote-context","null","not testable with Assertion Tester","Constrained implementations SHOULD NOT follow links to remote contexts." +"security-server-auth-td","null","not testable with Assertion Tester","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated." +"security-static-context","null","not testable with Assertion Tester","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process." +"td-context-ns-td10-namespacev10","null","not testable with Assertion Tester","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification." +"td-default-AdditionalResponseContentType","null","not testable with Assertion Tester","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to." +"td-default-observable","null","not testable with Assertion Tester","PropertyAffordance observable false" +"td-processor-bidi-isolation","null","not testable with Assertion Tester","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)" +"td-producer-mixed-direction","null","not testable with Assertion Tester","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent." +"td-security-extension","null","not testable with Assertion Tester","Additional security schemes MUST be Subclasses of the Class SecurityScheme." +"td-text-direction-first-strong","null","not testable with Assertion Tester","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback." +"td-text-direction-language-tag","null","not testable with Assertion Tester","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings." +"thing-model-td-generation-processor-extends","null","not testable with Assertion Tester","If used" +"thing-model-td-generation-processor-forms","null","not testable with Assertion Tester","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or ." +"thing-model-td-generation-processor-imports","null","not testable with Assertion Tester","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to ." +"thing-model-td-generation-processor-optional","null","not testable with Assertion Tester","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance." +"thing-model-td-generation-processor-placeholder","null","not testable with Assertion Tester","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD." +"thing-model-td-generation-processor-required","null","not testable with Assertion Tester","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance." +"thing-model-td-generation-processor-type","null","not testable with Assertion Tester","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance." +"tm-derivation-validity","null","not testable with Assertion Tester","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model." +"tm-overwrite-interaction","null","not testable with Assertion Tester","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model." +"tm-overwrite-types","null","not testable with Assertion Tester","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." +"tm-placeholder-replacement","null","not testable with Assertion Tester","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." +"tm-ref-recursive-extensions","null","not testable with Assertion Tester","Recursive extensions leading to an infinite loop MUST NOT be defined." +"tm-tmOptional-resolver","null","not testable with Assertion Tester","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." +"tm-tmRef-overwrite-possibility","null","not testable with Assertion Tester","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." +"tm-tmRef-overwrite-process","null","not testable with Assertion Tester","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." +"tm-tmRef-overwrite-semantic-meaning","null","not testable with Assertion Tester","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition." +"tm-tmRef2","null","not testable with Assertion Tester","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." +"tm-versioning-1","null","not testable with Assertion Tester","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." \ No newline at end of file diff --git a/packages/assertions/assertions-csv/needsReview.csv b/packages/assertions/assertions-csv/needsReview.csv index 22f4e237e..a8a18e22b 100644 --- a/packages/assertions/assertions-csv/needsReview.csv +++ b/packages/assertions/assertions-csv/needsReview.csv @@ -1,43 +1,43 @@ -"ID","Status","Assertion","Comment" -"privacy-auth-users-only","null","Only authorized users SHOULD be provided access to the Thing Description for a Thing.","" -"privacy-centralized-ids","null","TD identifiers SHOULD NOT be generated using a centralized authority.","" -"privacy-essential-metadata-only","null","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD.","" -"privacy-immutable-id-as-property","null","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier.","" -"privacy-mutable-identifiers","null","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary.","" -"privacy-temp-id-metadata","null","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself.","" -"sec-body-name-json-pointer-type","null",".","" -"sec-inj-no-intl-markup","null","HTML markup SHOULD NOT be used for internationalization purposes in TD strings.","" -"security-context-secure-fetch","null","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given.","" -"security-jsonld-expansion","null","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing.","" -"security-mutual-auth-td","null","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels.","" -"security-no-execution","null","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed.","" -"security-oauth-limits","null","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access.","" -"security-remote-context","null","Constrained implementations SHOULD NOT follow links to remote contexts.","" -"security-server-auth-td","null","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated.","" -"security-static-context","null","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process.","" -"td-context-ns-td10-namespacev10","null","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification.","" -"td-default-AdditionalResponseContentType","null","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to.","" -"td-default-observable","null","PropertyAffordance observable false","" -"td-processor-bidi-isolation","null","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)","" -"td-producer-mixed-direction","null","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent.","" -"td-security-extension","null","Additional security schemes MUST be Subclasses of the Class SecurityScheme.","" -"td-text-direction-first-strong","null","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback.","" -"td-text-direction-language-tag","null","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings.","" -"thing-model-td-generation-processor-extends","null","If used","" -"thing-model-td-generation-processor-forms","null","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or .","" -"thing-model-td-generation-processor-imports","null","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to .","" -"thing-model-td-generation-processor-optional","null","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance.","" -"thing-model-td-generation-processor-placeholder","null","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD.","" -"thing-model-td-generation-processor-required","null","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance.","" -"thing-model-td-generation-processor-type","null","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance.","" -"tm-derivation-validity","null","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model.","" -"tm-overwrite-interaction","null","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model.","" -"tm-overwrite-types","null","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions.","" -"tm-placeholder-replacement","null","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model.","" -"tm-ref-recursive-extensions","null","Recursive extensions leading to an infinite loop MUST NOT be defined.","" -"tm-tmOptional-resolver","null","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition.","" -"tm-tmRef-overwrite-possibility","null","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value.","" -"tm-tmRef-overwrite-process","null","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs.","" -"tm-tmRef-overwrite-semantic-meaning","null","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition.","" -"tm-tmRef2","null","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition.","" -"tm-versioning-1","null","When the Thing Model definitions change over time, this SHOULD be reflected in the version container.","" \ No newline at end of file +"ID","Status","Comment","Description" +"privacy-auth-users-only","null","not testable with Assertion Tester","Only authorized users SHOULD be provided access to the Thing Description for a Thing." +"privacy-centralized-ids","null","not testable with Assertion Tester","TD identifiers SHOULD NOT be generated using a centralized authority." +"privacy-essential-metadata-only","null","not testable with Assertion Tester","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD." +"privacy-immutable-id-as-property","null","not testable with Assertion Tester","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier." +"privacy-mutable-identifiers","null","not testable with Assertion Tester","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary." +"privacy-temp-id-metadata","null","not testable with Assertion Tester","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself." +"sec-body-name-json-pointer-type","null","not testable with Assertion Tester","." +"sec-inj-no-intl-markup","null","not testable with Assertion Tester","HTML markup SHOULD NOT be used for internationalization purposes in TD strings." +"security-context-secure-fetch","null","not testable with Assertion Tester","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given." +"security-jsonld-expansion","null","not testable with Assertion Tester","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing." +"security-mutual-auth-td","null","not testable with Assertion Tester","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels." +"security-no-execution","null","not testable with Assertion Tester","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed." +"security-oauth-limits","null","not testable with Assertion Tester","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access." +"security-remote-context","null","not testable with Assertion Tester","Constrained implementations SHOULD NOT follow links to remote contexts." +"security-server-auth-td","null","not testable with Assertion Tester","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated." +"security-static-context","null","not testable with Assertion Tester","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process." +"td-context-ns-td10-namespacev10","null","not testable with Assertion Tester","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification." +"td-default-AdditionalResponseContentType","null","not testable with Assertion Tester","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to." +"td-default-observable","null","not testable with Assertion Tester","PropertyAffordance observable false" +"td-processor-bidi-isolation","null","not testable with Assertion Tester","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)" +"td-producer-mixed-direction","null","not testable with Assertion Tester","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent." +"td-security-extension","null","not testable with Assertion Tester","Additional security schemes MUST be Subclasses of the Class SecurityScheme." +"td-text-direction-first-strong","null","not testable with Assertion Tester","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback." +"td-text-direction-language-tag","null","not testable with Assertion Tester","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings." +"thing-model-td-generation-processor-extends","null","not testable with Assertion Tester","If used" +"thing-model-td-generation-processor-forms","null","not testable with Assertion Tester","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or ." +"thing-model-td-generation-processor-imports","null","not testable with Assertion Tester","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to ." +"thing-model-td-generation-processor-optional","null","not testable with Assertion Tester","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance." +"thing-model-td-generation-processor-placeholder","null","not testable with Assertion Tester","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD." +"thing-model-td-generation-processor-required","null","not testable with Assertion Tester","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance." +"thing-model-td-generation-processor-type","null","not testable with Assertion Tester","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance." +"tm-derivation-validity","null","not testable with Assertion Tester","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model." +"tm-overwrite-interaction","null","not testable with Assertion Tester","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model." +"tm-overwrite-types","null","not testable with Assertion Tester","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." +"tm-placeholder-replacement","null","not testable with Assertion Tester","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." +"tm-ref-recursive-extensions","null","not testable with Assertion Tester","Recursive extensions leading to an infinite loop MUST NOT be defined." +"tm-tmOptional-resolver","null","not testable with Assertion Tester","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." +"tm-tmRef-overwrite-possibility","null","not testable with Assertion Tester","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." +"tm-tmRef-overwrite-process","null","not testable with Assertion Tester","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." +"tm-tmRef-overwrite-semantic-meaning","null","not testable with Assertion Tester","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition." +"tm-tmRef2","null","not testable with Assertion Tester","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." +"tm-versioning-1","null","not testable with Assertion Tester","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." \ No newline at end of file diff --git a/packages/assertions/assertions-csv/old.csv b/packages/assertions/assertions-csv/old.csv index 78ee230a6..4f2034bf9 100644 --- a/packages/assertions/assertions-csv/old.csv +++ b/packages/assertions/assertions-csv/old.csv @@ -1 +1 @@ -"ID","Status","Assertion","Comment" \ No newline at end of file +"ID","Status","Comment","Description" \ No newline at end of file diff --git a/packages/assertions/assertions-csv/report.json b/packages/assertions/assertions-csv/report.json index 090219d37..4bad9ca49 100644 --- a/packages/assertions/assertions-csv/report.json +++ b/packages/assertions/assertions-csv/report.json @@ -1 +1 @@ -{"generationDate":"Thu, 06 Oct 2022 13:01:16 GMT","assertionsSize":454,"implementedSize":369,"manualSize":90,"oldSize":0,"needsReviewSize":42} \ No newline at end of file +{"generationDate":"Thu, 06 Oct 2022 13:22:46 GMT","assertionsSize":454,"implementedSize":369,"manualSize":90,"oldSize":1,"needsReviewSize":42} \ No newline at end of file diff --git a/packages/assertions/index.js b/packages/assertions/index.js index c54f2c8ef..382833799 100644 --- a/packages/assertions/index.js +++ b/packages/assertions/index.js @@ -253,7 +253,7 @@ function collectAssertionSchemas(assertionsDirectory, assertionsList, loadFuncti * @returns {string} csv formatted results */ function resultsToCsv(results) { - const fields = ['ID', 'Status', 'Comment', 'Assertion'] + const fields = ['ID', 'Status', 'Comment', 'Description'] const json2csvParser = new Json2csvParser({ fields }) From 85098fb77e7e753becb7c82aeb0495018a628ded Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 15:24:35 +0200 Subject: [PATCH 16/28] remove quotes for diff check with testing tools --- packages/assertions/assertions-csv/manual.csv | 180 +++++++++--------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/packages/assertions/assertions-csv/manual.csv b/packages/assertions/assertions-csv/manual.csv index de818748d..a7ab60d3d 100644 --- a/packages/assertions/assertions-csv/manual.csv +++ b/packages/assertions/assertions-csv/manual.csv @@ -1,91 +1,91 @@ "ID","Status","Comment","Description" -"bindings-requirements-scheme","null","not testable with Assertion Tester", -"bindings-server-accept","null","not testable with Assertion Tester", -"client-data-schema","null","not testable with Assertion Tester", -"client-data-schema-accept-extras","null","not testable with Assertion Tester", -"client-data-schema-no-extras","null","not testable with Assertion Tester", -"client-uri-template","null","not testable with Assertion Tester", -"sec-body-name-json-pointer-creatable","null","not testable with Assertion Tester", -"server-data-schema","null","not testable with Assertion Tester", -"server-data-schema-extras","null","not testable with Assertion Tester", -"server-uri-template","null","not testable with Assertion Tester", -"td-context-default-language-direction-independence","null","not testable with Assertion Tester", -"td-default-alg","null","not testable with Assertion Tester", -"td-default-contentType","null","not testable with Assertion Tester", -"td-default-format","null","not testable with Assertion Tester", -"td-default-http-method","null","not testable with Assertion Tester", -"td-default-http-method_get","null","not testable with Assertion Tester", -"td-default-http-method_post","null","not testable with Assertion Tester", -"td-default-http-method_put","null","not testable with Assertion Tester", -"td-default-idempotent","null","not testable with Assertion Tester", -"td-default-in-apikey","null","not testable with Assertion Tester", -"td-default-in-basic","null","not testable with Assertion Tester", -"td-default-in-bearer","null","not testable with Assertion Tester", -"td-default-in-digest","null","not testable with Assertion Tester", -"td-default-op-actions","null","not testable with Assertion Tester", -"td-default-op-events","null","not testable with Assertion Tester", -"td-default-op-properties","null","not testable with Assertion Tester", -"td-default-qop","null","not testable with Assertion Tester", -"td-default-readOnly","null","not testable with Assertion Tester", -"td-default-safe","null","not testable with Assertion Tester", -"td-default-success","null","not testable with Assertion Tester", -"td-default-writeOnly","null","not testable with Assertion Tester", -"td-expectedResponse-contentType","null","not testable with Assertion Tester", -"td-expectedResponse-default-contentType","null","not testable with Assertion Tester", -"td-form-protocolbindings","null","not testable with Assertion Tester", -"td-format-validation-other-values","null","not testable with Assertion Tester", -"td-json-open","null","not testable with Assertion Tester", -"td-json-open_accept-byte-order","null","not testable with Assertion Tester", -"td-json-open_no-byte-order","null","not testable with Assertion Tester", -"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester", -"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester", -"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester", -"td-processor-serialization","null","not testable with Assertion Tester", -"td-security-binding","null","not testable with Assertion Tester", -"td-security-in-query-over-uri","null","not testable with Assertion Tester", -"td-security-no-extras","null","not testable with Assertion Tester", -"td-security-no-secrets","null","not testable with Assertion Tester", -"td-vocabulary-defaults","null","not testable with Assertion Tester", -"well-known-operation-types-only","null","not testable with Assertion Tester", -"privacy-auth-users-only","null","not testable with Assertion Tester","Only authorized users SHOULD be provided access to the Thing Description for a Thing." -"privacy-centralized-ids","null","not testable with Assertion Tester","TD identifiers SHOULD NOT be generated using a centralized authority." -"privacy-essential-metadata-only","null","not testable with Assertion Tester","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD." -"privacy-immutable-id-as-property","null","not testable with Assertion Tester","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier." -"privacy-mutable-identifiers","null","not testable with Assertion Tester","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary." -"privacy-temp-id-metadata","null","not testable with Assertion Tester","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself." -"sec-body-name-json-pointer-type","null","not testable with Assertion Tester","." -"sec-inj-no-intl-markup","null","not testable with Assertion Tester","HTML markup SHOULD NOT be used for internationalization purposes in TD strings." -"security-context-secure-fetch","null","not testable with Assertion Tester","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given." -"security-jsonld-expansion","null","not testable with Assertion Tester","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing." -"security-mutual-auth-td","null","not testable with Assertion Tester","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels." -"security-no-execution","null","not testable with Assertion Tester","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed." -"security-oauth-limits","null","not testable with Assertion Tester","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access." -"security-remote-context","null","not testable with Assertion Tester","Constrained implementations SHOULD NOT follow links to remote contexts." -"security-server-auth-td","null","not testable with Assertion Tester","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated." -"security-static-context","null","not testable with Assertion Tester","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process." -"td-context-ns-td10-namespacev10","null","not testable with Assertion Tester","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification." -"td-default-AdditionalResponseContentType","null","not testable with Assertion Tester","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to." -"td-default-observable","null","not testable with Assertion Tester","PropertyAffordance observable false" -"td-processor-bidi-isolation","null","not testable with Assertion Tester","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)" -"td-producer-mixed-direction","null","not testable with Assertion Tester","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent." -"td-security-extension","null","not testable with Assertion Tester","Additional security schemes MUST be Subclasses of the Class SecurityScheme." -"td-text-direction-first-strong","null","not testable with Assertion Tester","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback." -"td-text-direction-language-tag","null","not testable with Assertion Tester","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings." -"thing-model-td-generation-processor-extends","null","not testable with Assertion Tester","If used" -"thing-model-td-generation-processor-forms","null","not testable with Assertion Tester","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or ." -"thing-model-td-generation-processor-imports","null","not testable with Assertion Tester","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to ." -"thing-model-td-generation-processor-optional","null","not testable with Assertion Tester","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance." -"thing-model-td-generation-processor-placeholder","null","not testable with Assertion Tester","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD." -"thing-model-td-generation-processor-required","null","not testable with Assertion Tester","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance." -"thing-model-td-generation-processor-type","null","not testable with Assertion Tester","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance." -"tm-derivation-validity","null","not testable with Assertion Tester","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model." -"tm-overwrite-interaction","null","not testable with Assertion Tester","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model." -"tm-overwrite-types","null","not testable with Assertion Tester","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." -"tm-placeholder-replacement","null","not testable with Assertion Tester","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." -"tm-ref-recursive-extensions","null","not testable with Assertion Tester","Recursive extensions leading to an infinite loop MUST NOT be defined." -"tm-tmOptional-resolver","null","not testable with Assertion Tester","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." -"tm-tmRef-overwrite-possibility","null","not testable with Assertion Tester","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." -"tm-tmRef-overwrite-process","null","not testable with Assertion Tester","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." -"tm-tmRef-overwrite-semantic-meaning","null","not testable with Assertion Tester","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition." -"tm-tmRef2","null","not testable with Assertion Tester","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." -"tm-versioning-1","null","not testable with Assertion Tester","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." \ No newline at end of file +bindings-requirements-scheme,null,not testable with Assertion Tester,"Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding indicated by the URI scheme of its href member." +bindings-server-accept,null,not testable with Assertion Tester,"Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction." +client-data-schema,null,not testable with Assertion Tester,"A Thing acting as a Consumer when interacting with another target Thing described in a WoT Thing Description MUST generate data organized according to the data schemas given in the corresponding interactions." +client-data-schema-accept-extras,null,not testable with Assertion Tester,"A Thing acting as a Consumer when interacting with another Thing MUST accept without error any additional data not described in the data schemas given in the Thing Description of the target Thing." +client-data-schema-no-extras,null,not testable with Assertion Tester,"A Thing acting as a Consumer when interacting with another Thing MUST NOT generate data not described in the data schemas given in the Thing Description of that Thing." +client-uri-template,null,not testable with Assertion Tester,"A Thing acting as a Consumer when interacting with another Thing MUST generate URIs according to the URI Templates, base URIs, and form href parameters given in the Thing Description of the target Thing." +sec-body-name-json-pointer-creatable,null,not testable with Assertion Tester,"When an element of a data schema indicated by a JSON pointer indicated in a body locator does not already exist in the indicated schema, it MUST be possible to insert the indicated element at the location indicated by the pointer." +server-data-schema,null,not testable with Assertion Tester,"A WoT Thing Description MUST accurately describe the data returned and accepted by each interaction." +server-data-schema-extras,null,not testable with Assertion Tester,"A Thing MAY return additional data from an interaction even when such data is not described in the data schemas given in its WoT Thing Description." +server-uri-template,null,not testable with Assertion Tester,"URI Templates, base URIs, and href members in a WoT Thing Description MUST accurately describe the WoT Interface of the Thing." +td-context-default-language-direction-independence,null,not testable with Assertion Tester,"However, when interpreting human-readable text, each human-readable string value MUST be processed independently." +td-default-alg,null,not testable with Assertion Tester,"The value associated with member alg if not given MUST be assumed to have the default value ES256." +td-default-contentType,null,not testable with Assertion Tester,"The value associated with member contentType if not given MUST be assumed to have the default value application/json." +td-default-format,null,not testable with Assertion Tester,"The value associated with member format if not given MUST be assumed to have the default value jwt." +td-default-http-method,null,not testable with Assertion Tester,"When no method is indicated in a form representing an Protocol Binding based on HTTP, a Default Value MUST be assumed as shown in the following table." +td-default-http-method_get,null,not testable with Assertion Tester,"The value associated with member GET if not given MUST be assumed to have the default value Form with operation type readproperty" +td-default-http-method_post,null,not testable with Assertion Tester,"The value associated with member POST if not given MUST be assumed to have the default value Form with operation type invokeaction." +td-default-http-method_put,null,not testable with Assertion Tester,"The value associated with member PUT if not given MUST be assumed to have the default value Form with operation type writeproperty." +td-default-idempotent,null,not testable with Assertion Tester,"The value associated with member idempotent if not given MUST be assumed to have the default value false." +td-default-in-apikey,null,not testable with Assertion Tester,"The value associated with member in if not given MUST be assumed to have the default value query." +td-default-in-basic,null,not testable with Assertion Tester,"The value associated with member in if not given MUST be assumed to have the default value header." +td-default-in-bearer,null,not testable with Assertion Tester,"The value associated with member in if not given MUST be assumed to have the default value header." +td-default-in-digest,null,not testable with Assertion Tester,"The value associated with member in if not given MUST be assumed to have the default value header." +td-default-op-actions,null,not testable with Assertion Tester,"The value associated with member op if not given MUST be assumed to have the default value invokeaction." +td-default-op-events,null,not testable with Assertion Tester,"The value associated with member op if not given MUST be assumed to have the default value subscribeevent." +td-default-op-properties,null,not testable with Assertion Tester,"The value associated with member op if not given MUST be assumed to have the default value Array of string with the elements readproperty and writeproperty." +td-default-qop,null,not testable with Assertion Tester,"The value associated with member qop if not given MUST be assumed to have the default value auth." +td-default-readOnly,null,not testable with Assertion Tester,"The value associated with member readOnly if not given MUST be assumed to have the default value false." +td-default-safe,null,not testable with Assertion Tester,"The value associated with member safe if not given MUST be assumed to have the default value false." +td-default-success,null,not testable with Assertion Tester,"." +td-default-writeOnly,null,not testable with Assertion Tester,"The value associated with member writeOnly if not given MUST be assumed to have the default value false." +td-expectedResponse-contentType,null,not testable with Assertion Tester,"If the content type of the expected response differs from the content type of the form, the Form instance MUST include a name-value pair with the name response." +td-expectedResponse-default-contentType,null,not testable with Assertion Tester,"If no response name-value pair is provided, it MUST be assumed that the content type of the response is equal to the content type assigned to the Form instance." +td-form-protocolbindings,null,not testable with Assertion Tester,"If required, form objects MAY be supplemented with protocol-specific Vocabulary Terms identified with a prefix." +td-format-validation-other-values,null,not testable with Assertion Tester,"When a value that is not found in the known set of values is assigned to format, such a validation SHOULD succeed." +td-json-open,null,not testable with Assertion Tester,"TDs MUST be serialized according to the requirements defined in Section 8.1 of RFC8259 for open ecosystems." +td-json-open_accept-byte-order,null,not testable with Assertion Tester,"TD Processors MAY ignore the presence of a byte order mark rather than treating it as an error." +td-json-open_no-byte-order,null,not testable with Assertion Tester,"Implementations MUST NOT add a byte order mark (U+FEFF) to the beginning of a TD document." +td-ns-multilanguage-content-negotiation,null,not testable with Assertion Tester,"In cases where the default language has been negotiated, an @language member MUST be present to indicate the result of the negotiation and the corresponding default language of the returned content." +td-ns-multilanguage-content-negotiation-no-multi,null,not testable with Assertion Tester,"When the default language has been negotiated successfully, TD documents SHOULD include the appropriate matching values for the members title and description in preference to MultiLanguage objects in titles and descriptions members." +td-ns-multilanguage-content-negotiation-optional,null,not testable with Assertion Tester,"Note however that Things MAY choose to not support such dynamically-generated TDs nor to support language negotiation (e.g., because of resource constraints)." +td-processor-serialization,null,not testable with Assertion Tester,"A TD Processor MUST be able to serialize Thing Descriptions into the JSON format and/or deserialize Thing Descriptions from that format, according to the rules noted in and." +td-security-binding,null,not testable with Assertion Tester,"If a Thing requires a specific access mechanism for an interaction, that mechanism MUST be specified in the security configuration of the Thing Description." +td-security-in-query-over-uri,null,not testable with Assertion Tester,"The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable." +td-security-no-extras,null,not testable with Assertion Tester,"If a Thing does not require a specific access mechanism for an interaction, that mechanism MUST NOT be specified in the security configuration of the Thing Description." +td-security-no-secrets,null,not testable with Assertion Tester,"For all security schemes, any private keys, passwords, or other sensitive information directly providing access should be shared and stored out-of-band and MUST NOT be stored in the TD." +td-vocabulary-defaults,null,not testable with Assertion Tester,"When assignments in a TD are missing, a TD Processor MUST follow the Default Value assignments expressed in the table of." +well-known-operation-types-only,null,not testable with Assertion Tester,"operations types SHOULD NOT be arbitrarily set by servients." +privacy-auth-users-only,null,not testable with Assertion Tester,"Only authorized users SHOULD be provided access to the Thing Description for a Thing." +privacy-centralized-ids,null,not testable with Assertion Tester,"TD identifiers SHOULD NOT be generated using a centralized authority." +privacy-essential-metadata-only,null,not testable with Assertion Tester,"Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD." +privacy-immutable-id-as-property,null,not testable with Assertion Tester,"Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier." +privacy-mutable-identifiers,null,not testable with Assertion Tester,"All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary." +privacy-temp-id-metadata,null,not testable with Assertion Tester,"Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself." +sec-body-name-json-pointer-type,null,not testable with Assertion Tester,"." +sec-inj-no-intl-markup,null,not testable with Assertion Tester,"HTML markup SHOULD NOT be used for internationalization purposes in TD strings." +security-context-secure-fetch,null,not testable with Assertion Tester,"If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given." +security-jsonld-expansion,null,not testable with Assertion Tester,"Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing." +security-mutual-auth-td,null,not testable with Assertion Tester,"Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels." +security-no-execution,null,not testable with Assertion Tester,"A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed." +security-oauth-limits,null,not testable with Assertion Tester,"To limit the scope and duration of access to Things, tokens SHOULD be used to manage access." +security-remote-context,null,not testable with Assertion Tester,"Constrained implementations SHOULD NOT follow links to remote contexts." +security-server-auth-td,null,not testable with Assertion Tester,"In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated." +security-static-context,null,not testable with Assertion Tester,"Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process." +td-context-ns-td10-namespacev10,null,not testable with Assertion Tester,"TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification." +td-default-AdditionalResponseContentType,null,not testable with Assertion Tester,"AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to." +td-default-observable,null,not testable with Assertion Tester,"PropertyAffordance observable false" +td-processor-bidi-isolation,null,not testable with Assertion Tester,"TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)" +td-producer-mixed-direction,null,not testable with Assertion Tester,"TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent." +td-security-extension,null,not testable with Assertion Tester,"Additional security schemes MUST be Subclasses of the Class SecurityScheme." +td-text-direction-first-strong,null,not testable with Assertion Tester,"When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback." +td-text-direction-language-tag,null,not testable with Assertion Tester,"For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings." +thing-model-td-generation-processor-extends,null,not testable with Assertion Tester,"If used" +thing-model-td-generation-processor-forms,null,not testable with Assertion Tester,"Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or ." +thing-model-td-generation-processor-imports,null,not testable with Assertion Tester,"Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to ." +thing-model-td-generation-processor-optional,null,not testable with Assertion Tester,"All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance." +thing-model-td-generation-processor-placeholder,null,not testable with Assertion Tester,"If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD." +thing-model-td-generation-processor-required,null,not testable with Assertion Tester,"All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance." +thing-model-td-generation-processor-type,null,not testable with Assertion Tester,"The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance." +tm-derivation-validity,null,not testable with Assertion Tester,"When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model." +tm-overwrite-interaction,null,not testable with Assertion Tester,"A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model." +tm-overwrite-types,null,not testable with Assertion Tester,"Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." +tm-placeholder-replacement,null,not testable with Assertion Tester,"The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." +tm-ref-recursive-extensions,null,not testable with Assertion Tester,"Recursive extensions leading to an infinite loop MUST NOT be defined." +tm-tmOptional-resolver,null,not testable with Assertion Tester,"The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." +tm-tmRef-overwrite-possibility,null,not testable with Assertion Tester,"If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." +tm-tmRef-overwrite-process,null,not testable with Assertion Tester,"The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." +tm-tmRef-overwrite-semantic-meaning,null,not testable with Assertion Tester,"Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition." +tm-tmRef2,null,not testable with Assertion Tester,"Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." +tm-versioning-1,null,not testable with Assertion Tester,"When the Thing Model definitions change over time, this SHOULD be reflected in the version container." \ No newline at end of file From b61bd61a069e75944e6a56e77ea6194126bcc831 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 16:47:46 +0200 Subject: [PATCH 17/28] change op to allow multiple values inside op --- .../td-vocab-op--Form_cancelaction.json | 39 +------------ .../td-vocab-op--Form_invokeaction.json | 58 +------------------ .../td-vocab-op--Form_observeproperty.json | 58 +------------------ .../td-vocab-op--Form_queryaction.json | 27 +-------- .../td-vocab-op--Form_readproperty.json | 6 +- .../td-vocab-op--Form_subscribeevent.json | 38 +----------- .../td-vocab-op--Form_unobserveproperty.json | 38 +----------- .../td-vocab-op--Form_unsubscribeevent.json | 58 +------------------ .../td-vocab-op--Form_writeproperty.json | 6 +- 9 files changed, 19 insertions(+), 309 deletions(-) diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json index 41fc9c64f..6ed34c590 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json @@ -36,22 +36,6 @@ }, "additionalProperties": true, "definitions": { - "property_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "action_element": { "type": "object", "properties": { @@ -68,22 +52,6 @@ ], "additionalProperties": true }, - "event_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "form_element": { "type": "object", "if": { @@ -98,11 +66,10 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "cancelaction" - ] + "const": "cancelaction" + } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json index f216ff979..c407c8be8 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_invokeaction.json @@ -6,52 +6,16 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/property_element" - } - - }, "actions": { "type": "object", "additionalProperties": { "$ref": "#/definitions/action_element" } - }, - "events": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/event_element" - } } }, "additionalProperties": true, "definitions": { - "property_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "action_element": { "type": "object", "properties": { @@ -68,22 +32,6 @@ ], "additionalProperties": true }, - "event_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "form_element": { "type": "object", "if": { @@ -98,11 +46,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "invokeaction" - ] + "const": "invokeaction" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json index 23e58fb92..5e4e39418 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_observeproperty.json @@ -6,33 +6,13 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, "properties": { "type": "object", "additionalProperties": { "$ref": "#/definitions/property_element" } - }, - "actions": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/action_element" - } - }, - "events": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/event_element" - } } - }, "additionalProperties": true, "definitions": { @@ -52,38 +32,6 @@ ], "additionalProperties": true }, - "action_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, - "event_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "form_element": { "type": "object", "if": { @@ -98,11 +46,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "observeproperty" - ] + "const": "observeproperty" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json index 6be63e013..1061f3fab 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json @@ -6,33 +6,12 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/property_element" - } - - }, "actions": { "type": "object", "additionalProperties": { "$ref": "#/definitions/action_element" } - }, - "events": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/event_element" - } } - }, "additionalProperties": true, "definitions": { @@ -98,11 +77,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "queryaction" - ] + "const": "queryaction" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json index 71ab042fc..1a44df8f6 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_readproperty.json @@ -45,11 +45,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "readproperty" - ] + "const": "readproperty" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json index d7607da3f..1fb767d42 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json @@ -36,38 +36,6 @@ }, "additionalProperties": true, "definitions": { - "property_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, - "action_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "event_element": { "type": "object", "properties": { @@ -98,11 +66,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "subscribeevent" - ] + "const": "subscribeevent" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json index 2b578f21b..fefcf509e 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json @@ -52,38 +52,6 @@ ], "additionalProperties": true }, - "action_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, - "event_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "form_element": { "type": "object", "if": { @@ -98,11 +66,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "unobserveproperty" - ] + "const": "unobserveproperty" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json index 3219ded9f..db40d7ded 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unsubscribeevent.json @@ -6,26 +6,6 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/property_element" - } - - }, - "actions": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/action_element" - } - }, "events": { "type": "object", "additionalProperties": { @@ -36,38 +16,6 @@ }, "additionalProperties": true, "definitions": { - "property_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, - "action_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "event_element": { "type": "object", "properties": { @@ -98,11 +46,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "unsubscribeevent" - ] + "const": "unsubscribeevent" } } ] diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json index fa498f6f0..53e6a979a 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_writeproperty.json @@ -45,11 +45,9 @@ }, { "type": "array", - "items": { + "contains": { "type": "string", - "enum": [ - "writeproperty" - ] + "const": "writeproperty" } } ] From ff69331770177c92b53afe25872343eaeb4ae4a4 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 17:06:03 +0200 Subject: [PATCH 18/28] add mqtt example with action management --- .../examples/tds/valid/mqtt-experimental.json | 231 ++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 packages/core/examples/tds/valid/mqtt-experimental.json diff --git a/packages/core/examples/tds/valid/mqtt-experimental.json b/packages/core/examples/tds/valid/mqtt-experimental.json new file mode 100644 index 000000000..f61fc3296 --- /dev/null +++ b/packages/core/examples/tds/valid/mqtt-experimental.json @@ -0,0 +1,231 @@ +{ + "@context": [ + "https://www.w3.org/2022/wot/td/v1.1", + { + "@language": "en" + } + ], + "id": "urn:uuid:c2b126b3-4ef2-40e9-9cad-f768608fdd0d", + "title": "MQTT Experimental", + "description": "A Thing demonstrating how to use observe and unobserve property. You can publish to testOneOf or to testMaxItems to trigger the events", + "securityDefinitions": { + "auto_sc": { + "scheme": "auto" + } + }, + "security": [ + "auto_sc" + ], + "schemaDefinitions": { + "actionCancellation": { + "type": "string", + "const": "action canceled :-(" + }, + "actionQueryOutput": { + "type": "integer" + } + }, + "support": "https://github.com/egekorkan/wot-implementations/tree/master/mqtt-online", + "properties": { + "oneOfTest": { + "readOnly": true, + "writeOnly": false, + "observable": true, + "oneOf": [ + { + "type": "string", + "const": "smaller than 3" + }, + { + "type": "string", + "pattern": "^(\\([0-9]{3}\\))?[0-9]{3}-[0-9]{4}$" + }, + { + "type": "integer", + "multipleOf": 6, + "exclusiveMaximum": 60, + "exclusiveMinimum": 0 + }, + { + "type": "number", + "exclusiveMaximum": 60, + "exclusiveMinimum": 0 + }, + { + "type": "null" + } + ], + "forms": [ + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/oneOfTest", + "contentType": "application/json", + "op": "observeproperty", + "mqv:controlPacket": "mqv:subscribe" + }, + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/oneOfTest", + "contentType": "application/json", + "op": "unobserveproperty", + "mqv:controlPacket": "mqv:unsubscribe" + } + ] + }, + "maxItemsTest": { + "readOnly": true, + "writeOnly": false, + "type": "array", + "items": { + "type": "integer" + }, + "maxItems": 5, + "minItems": 2, + "forms": [ + { + "href": "mqtt://iot.eclipse.org/maxItemsTest", + "contentType": "application/json", + "op": "observeproperty", + "mqtt:commandCode": 8 + }, + { + "href": "mqtt://iot.eclipse.org/maxItemsTest", + "contentType": "application/json", + "op": "unobserveproperty", + "mqtt:methodCode": 10 + } + ] + }, + "encodingTest": { + "readOnly": true, + "writeOnly": false, + "observable": true, + "type": "string", + "contentMediaType": "image/png", + "contentEncoding": "base64", + "forms": [ + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/encodingTest", + "contentType": "application/json", + "op": "observeproperty", + "mqv:controlPacket": "mqv:subscribe" + }, + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/encodingTest", + "contentType": "application/json", + "op": "unobserveproperty", + "mqv:controlPacket": "mqv:unsubscribe" + } + ] + }, + "formEncodingTest": { + "description": "This delivers an array of sensor values as gzip", + "readOnly": true, + "writeOnly": false, + "observable": true, + "forms": [ + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/formEncodingTest", + "contentType": "application/csv", + "contentCoding": "gzip", + "op": "readproperty", + "mqv:controlPacket": "mqv:subscribe", + "mqv:retain": true + } + ] + } + }, + "actions": { + "actionTest": { + "input": { + "type": "integer", + "minimum": 1, + "default": 10, + "description": "indicates how long this action should run in seconds" + }, + "output": { + "type": "string", + "enum": [ + "that took a while", + "that was quick" + ] + }, + "forms": [ + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/actionTest", + "contentType": "application/json", + "op": "invokeaction", + "mqv:controlPacket": "mqv:publish" + }, + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/actionTest/remaining", + "contentType": "application/json", + "op": ["queryaction", "cancelaction"], + "mqv:controlPacket": "mqv:subscribe", + "additionalResponses": [ + { + "success": true, + "contentType": "application/json", + "schema": "actionQueryOutput" + } + ] + }, + { + "href": "mqtt://test.mosquitto.org", + "mqv:topic": "EgeMyPublisher/actionTest/cancel", + "contentType": "application/json", + "op": "cancelaction", + "mqv:controlPacket": "mqv:publish", + "additionalResponses": [ + { + "success": true, + "contentType": "application/json", + "schema": "actionCancellation" + } + ] + } + ] + } + }, + "links": [ + { + "rel": "icon", + "href": "https://avatars.githubusercontent.com/u/20195407?s=64&v=4", + "type": "image/png", + "sizes": "64x64" + }, + { + "rel": "service-doc", + "href": "https://github.com/egekorkan/wot-implementations/blob/master/mqtt-online/Readme.md", + "type": "application/html", + "hreflang": "en" + }, + { + "rel": "predecessor-version", + "href": "https://raw.githubusercontent.com/egekorkan/wot-implementations/782d0aa30226eda376ced64da5b514c65966d97a/mqtt-hosted-retain/publisher.json", + "type": "application/td+json", + "anchor": "#" + } + ], + "forms": [ + { + "href": "mqtt://test.mosquitto.org", + "mqv:filter": "EgeMyPublisher/*", + "contentType": "application/json", + "op": "observeallproperties", + "mqv:controlPacket": "mqv:subscribe" + }, + { + "href": "mqtt://test.mosquitto.org", + "mqv:filter": "EgeMyPublisher/*", + "contentType": "application/json", + "op": "unobserveallproperties", + "mqv:controlPacket": "mqv:unsubscribe" + } + ] +} \ No newline at end of file From d7581e500b55e4b99a2166f3b5a48bd70049b31a Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 17:06:30 +0200 Subject: [PATCH 19/28] adjust op value detection for arrays --- .../td-vocab-op--Form_cancelaction.json | 20 ------------ .../td-vocab-op--Form_queryaction.json | 32 ------------------- .../td-vocab-op--Form_subscribeevent.json | 20 ------------ .../td-vocab-op--Form_unobserveproperty.json | 21 ------------ 4 files changed, 93 deletions(-) diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json index 6ed34c590..12cc84247 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_cancelaction.json @@ -6,31 +6,11 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/property_element" - } - - }, "actions": { "type": "object", "additionalProperties": { "$ref": "#/definitions/action_element" } - }, - "events": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/event_element" - } } }, diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json index 1061f3fab..c19e9e373 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_queryaction.json @@ -15,22 +15,6 @@ }, "additionalProperties": true, "definitions": { - "property_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "action_element": { "type": "object", "properties": { @@ -47,22 +31,6 @@ ], "additionalProperties": true }, - "event_element": { - "type": "object", - "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - } - }, - "required": [ - "forms" - ], - "additionalProperties": true - }, "form_element": { "type": "object", "if": { diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json index 1fb767d42..15c6050ed 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_subscribeevent.json @@ -6,26 +6,6 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, - "properties": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/property_element" - } - - }, - "actions": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/action_element" - } - }, "events": { "type": "object", "additionalProperties": { diff --git a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json index fefcf509e..9bc189011 100644 --- a/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json +++ b/packages/assertions/assertions-td/td-vocab-op--Form_unobserveproperty.json @@ -6,33 +6,12 @@ "also":["well-known-operation-types-only"], "type": "object", "properties": { - "forms": { - "type": "array", - "minItems": 1, - "items": { - "$ref": "#/definitions/form_element" - } - }, "properties": { "type": "object", "additionalProperties": { "$ref": "#/definitions/property_element" } - - }, - "actions": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/action_element" - } - }, - "events": { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/event_element" - } } - }, "additionalProperties": true, "definitions": { From 27c540a97f9f027ca7154da510aeba5feb659d3b Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Thu, 6 Oct 2022 21:17:40 +0200 Subject: [PATCH 20/28] move mqtt example --- .../examples/tds/{valid => notValidYet}/mqtt-experimental.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/core/examples/tds/{valid => notValidYet}/mqtt-experimental.json (100%) diff --git a/packages/core/examples/tds/valid/mqtt-experimental.json b/packages/core/examples/tds/notValidYet/mqtt-experimental.json similarity index 100% rename from packages/core/examples/tds/valid/mqtt-experimental.json rename to packages/core/examples/tds/notValidYet/mqtt-experimental.json From 25d385e07dee3881829b300497894d91e6d68b02 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 00:05:50 +0200 Subject: [PATCH 21/28] improve direction detection --- .../assertions/assertions-td/td-text-at-direction.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/assertions/assertions-td/td-text-at-direction.json b/packages/assertions/assertions-td/td-text-at-direction.json index a6409803d..8f7a11e03 100644 --- a/packages/assertions/assertions-td/td-text-at-direction.json +++ b/packages/assertions/assertions-td/td-text-at-direction.json @@ -14,7 +14,13 @@ "type":"object", "properties": { "@direction":{ - "type":"string" + "oneOf": [{ + "type":"string", + "enum":["ltr", "rtl"] + }, + { + "type":"null" + }] } }, "required": ["@direction"] From 420c0adc39d65f87115a61927ea8d3e0d4df100c Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 00:12:58 +0200 Subject: [PATCH 22/28] fix assertion description --- packages/assertions/assertions-td/td-text-at-direction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/assertions/assertions-td/td-text-at-direction.json b/packages/assertions/assertions-td/td-text-at-direction.json index 8f7a11e03..640c79d22 100644 --- a/packages/assertions/assertions-td/td-text-at-direction.json +++ b/packages/assertions/assertions-td/td-text-at-direction.json @@ -1,6 +1,6 @@ { "title": "td-text-at-direction", - "description": "The root element of a TD Serialization MUST be a JSON object that includes a member with the name @context and a value of type string or array that equals or respectively contains https://www.w3.org/2022/wot/td/v1.1. ", + "description": "Given that the Thing Description format is based on JSON-LD 1.1 [[?json-ld11]], @direction with the string values ltr, rtl and null value null MAY be used inside the @context to indicate the default text direction for the human readable strings in the entire TD document.", "is-complex": false, "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", From 5715b632a68d843794db3d47b216ad35c33db1c1 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 00:13:12 +0200 Subject: [PATCH 23/28] simplify default language detection --- .../td-context-default-language.json | 69 ++++--------------- 1 file changed, 14 insertions(+), 55 deletions(-) diff --git a/packages/assertions/assertions-td/td-context-default-language.json b/packages/assertions/assertions-td/td-context-default-language.json index 397019918..214f91417 100644 --- a/packages/assertions/assertions-td/td-context-default-language.json +++ b/packages/assertions/assertions-td/td-context-default-language.json @@ -1,65 +1,24 @@ { "title": "td-context-default-language", "description": "One Map contained in an @context Array SHOULD contain a name-value pair that defines the default language for the Thing Description, where the name is the Term @language and the value is a well-formed language tag as defined by [[!BCP47]] (e.g., en, de-AT, gsw-CH, zh-Hans, zh-Hant-HK, sl-nedis). ", - "is-complex": true, + "is-complex": false, "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", - "if": { - "required": [ - "@context" - ] - }, - "then": { - "properties": { - "@context": { - "if": { - "type": "string" - }, - "then": { - "const": "td-context-default-language=not-impl" - }, - "else": { - "if": { - "$ref": "#/definitions/thing-context" - }, - "then": { - "const": "td-context-default-language=pass" - } - } - } - } - }, - "additionalProperties": true, - "definitions": { - "thing-context-w3c-uri": { - "type": "string", - "enum": [ - "https://www.w3.org/2019/wot/td/v1" - ] - }, - "thing-context": { - "type": "array", - "items": [ - { - "$ref": "#/definitions/thing-context-w3c-uri" - } - ], - "additionalItems": { - "anyOf": [ - { - "type": "object", - "properties":{ - "@language":{ - "type":"string" - } - }, - "required":["@language"] + "required": [ + "@context" + ], + "properties": { + "@context": { + "type":"array", + "contains": { + "type":"object", + "properties": { + "@language":{ + "type":"string" } - ] + }, + "required": ["@language"] } - }, - "anyUri": { - "type": "string" } } } \ No newline at end of file From a8108855d60ac073ea1209ee05f1465718dfe51b Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 00:17:24 +0200 Subject: [PATCH 24/28] update manual csv of both tm and td --- packages/assertions/assertions-td/manual.csv | 120 +++++++++++-------- packages/assertions/assertions-tm/manual.csv | 20 +++- 2 files changed, 91 insertions(+), 49 deletions(-) diff --git a/packages/assertions/assertions-td/manual.csv b/packages/assertions/assertions-td/manual.csv index cbe082dbb..72859d25e 100644 --- a/packages/assertions/assertions-td/manual.csv +++ b/packages/assertions/assertions-td/manual.csv @@ -1,49 +1,73 @@ "ID","Status","Comment","Assertion" -"bindings-requirements-scheme","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST follow the requirements of the Protocol Binding indicated by the URI scheme of its href member." -"bindings-server-accept","null","not testable with Assertion Tester","Every form in a WoT Thing Description MUST accurately describe requests (including request headers, if present) accepted by the Thing in an interaction." -"client-data-schema","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another target Thing described in a WoT Thing Description MUST generate data organized according to the data schemas given in the corresponding interactions." -"client-data-schema-accept-extras","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST accept without error any additional data not described in the data schemas given in the Thing Description of the target Thing." -"client-data-schema-no-extras","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST NOT generate data not described in the data schemas given in the Thing Description of that Thing. " -"client-uri-template","null","not testable with Assertion Tester","A Thing acting as a Consumer when interacting with another Thing MUST generate URIs according to the URI Templates, base URIs, and form href parameters given in the Thing Description of the target Thing." -sec-body-name-json-pointer-creatable,"null","not testable with Assertion Tester","When an element of a data schema indicated by a JSON pointer indicated in a body locator does not already exist in the indicated schema, it MUST be possible to insert the indicated element at the location indicated by the pointer. ", -"server-data-schema","null","not testable with Assertion Tester","A WoT Thing Description MUST accurately describe the data returned and accepted by each interaction." -"server-data-schema-extras","null","not testable with Assertion Tester","A Thing MAY return additional data from an interaction even when such data is not described in the data schemas given in its WoT Thing Description." -"server-uri-template","null","not testable with Assertion Tester","URI Templates, base URIs, and href members in a WoT Thing Description MUST accurately describe the WoT Interface of the Thing." -"td-context-default-language-direction-independence","null","not testable with Assertion Tester","However, when interpreting human-readable text, each human-readable string value MUST be processed independently." -"td-default-alg","null","not testable with Assertion Tester","The value associated with member alg if not given MUST be assumed to have the default value ES256." -"td-default-contentType","null","not testable with Assertion Tester","The value associated with member contentType if not given MUST be assumed to have the default value application/json." -"td-default-format","null","not testable with Assertion Tester","The value associated with member format if not given MUST be assumed to have the default value jwt." -"td-default-http-method","null","not testable with Assertion Tester","When no method is indicated in a form representing an Protocol Binding based on HTTP, a Default Value MUST be assumed as shown in the following table." -"td-default-http-method_get","null","not testable with Assertion Tester","The value associated with member GET if not given MUST be assumed to have the default value Form with operation type readproperty" -"td-default-http-method_post","null","not testable with Assertion Tester","The value associated with member POST if not given MUST be assumed to have the default value Form with operation type invokeaction." -"td-default-http-method_put","null","not testable with Assertion Tester","The value associated with member PUT if not given MUST be assumed to have the default value Form with operation type writeproperty." -"td-default-idempotent","null","not testable with Assertion Tester","The value associated with member idempotent if not given MUST be assumed to have the default value false." -"td-default-in-apikey","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value query." -"td-default-in-basic","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-in-bearer","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-in-digest","null","not testable with Assertion Tester","The value associated with member in if not given MUST be assumed to have the default value header." -"td-default-op-actions","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value invokeaction." -"td-default-op-events","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value subscribeevent." -"td-default-op-properties","null","not testable with Assertion Tester","The value associated with member op if not given MUST be assumed to have the default value Array of string with the elements readproperty and writeproperty." -"td-default-qop","null","not testable with Assertion Tester","The value associated with member qop if not given MUST be assumed to have the default value auth." -"td-default-readOnly","null","not testable with Assertion Tester","The value associated with member readOnly if not given MUST be assumed to have the default value false." -"td-default-safe","null","not testable with Assertion Tester","The value associated with member safe if not given MUST be assumed to have the default value false." -"td-default-success","null","not testable with Assertion Tester","The value associated with member ""success"" if not given MUST be assumed to have the default value ""false""." -"td-default-writeOnly","null","not testable with Assertion Tester","The value associated with member writeOnly if not given MUST be assumed to have the default value false." -"td-expectedResponse-contentType","null","not testable with Assertion Tester","If the content type of the expected response differs from the content type of the form, the Form instance MUST include a name-value pair with the name response." -"td-expectedResponse-default-contentType","null","not testable with Assertion Tester","If no response name-value pair is provided, it MUST be assumed that the content type of the response is equal to the content type assigned to the Form instance." -"td-form-protocolbindings","null","not testable with Assertion Tester","If required, form objects MAY be supplemented with protocol-specific Vocabulary Terms identified with a prefix." -"td-format-validation-other-values","null","not testable with Assertion Tester","When a value that is not found in the known set of values is assigned to format, such a validation SHOULD succeed." -"td-json-open","null","not testable with Assertion Tester","TDs MUST be serialized according to the requirements defined in Section 8.1 of RFC8259 for open ecosystems." -"td-json-open_accept-byte-order","null","not testable with Assertion Tester","TD Processors MAY ignore the presence of a byte order mark rather than treating it as an error." -"td-json-open_no-byte-order","null","not testable with Assertion Tester","Implementations MUST NOT add a byte order mark (U+FEFF) to the beginning of a TD document." -"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester","In cases where the default language has been negotiated, an @language member MUST be present to indicate the result of the negotiation and the corresponding default language of the returned content." -"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester","When the default language has been negotiated successfully, TD documents SHOULD include the appropriate matching values for the members title and description in preference to MultiLanguage objects in titles and descriptions members. " -"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester","Note however that Things MAY choose to not support such dynamically-generated TDs nor to support language negotiation (e.g., because of resource constraints)." -"td-processor-serialization","null","not testable with Assertion Tester","A TD Processor MUST be able to serialize Thing Descriptions into the JSON format and/or deserialize Thing Descriptions from that format, according to the rules noted in and." -"td-security-binding","null","not testable with Assertion Tester","If a Thing requires a specific access mechanism for an interaction, that mechanism MUST be specified in the security configuration of the Thing Description." -"td-security-in-query-over-uri","null","not testable with Assertion Tester", "The value uri SHOULD be specified for the name in in a security scheme only if query is not applicable." -"td-security-no-extras","null","not testable with Assertion Tester","If a Thing does not require a specific access mechanism for an interaction, that mechanism MUST NOT be specified in the security configuration of the Thing Description." -"td-security-no-secrets","null","not testable with Assertion Tester","For all security schemes, any private keys, passwords, or other sensitive information directly providing access should be shared and stored out-of-band and MUST NOT be stored in the TD." -"td-vocabulary-defaults","null","not testable with Assertion Tester","When assignments in a TD are missing, a TD Processor MUST follow the Default Value assignments expressed in the table of." -"well-known-operation-types-only","null","not testable with Assertion Tester","operations types SHOULD NOT be arbitrarily set by servients." \ No newline at end of file +"bindings-requirements-scheme","null","not testable with Assertion Tester", +"bindings-server-accept","null","not testable with Assertion Tester", +"client-data-schema","null","not testable with Assertion Tester", +"client-data-schema-accept-extras","null","not testable with Assertion Tester", +"client-data-schema-no-extras","null","not testable with Assertion Tester", +"client-uri-template","null","not testable with Assertion Tester", +"sec-body-name-json-pointer-creatable","null","not testable with Assertion Tester", +"server-data-schema","null","not testable with Assertion Tester", +"server-data-schema-extras","null","not testable with Assertion Tester", +"server-uri-template","null","not testable with Assertion Tester", +"td-context-default-language-direction-independence","null","not testable with Assertion Tester", +"td-default-alg","null","not testable with Assertion Tester", +"td-default-contentType","null","not testable with Assertion Tester", +"td-default-format","null","not testable with Assertion Tester", +"td-default-http-method","null","not testable with Assertion Tester", +"td-default-http-method_get","null","not testable with Assertion Tester", +"td-default-http-method_post","null","not testable with Assertion Tester", +"td-default-http-method_put","null","not testable with Assertion Tester", +"td-default-idempotent","null","not testable with Assertion Tester", +"td-default-in-apikey","null","not testable with Assertion Tester", +"td-default-in-basic","null","not testable with Assertion Tester", +"td-default-in-bearer","null","not testable with Assertion Tester", +"td-default-in-digest","null","not testable with Assertion Tester", +"td-default-op-actions","null","not testable with Assertion Tester", +"td-default-op-events","null","not testable with Assertion Tester", +"td-default-op-properties","null","not testable with Assertion Tester", +"td-default-qop","null","not testable with Assertion Tester", +"td-default-readOnly","null","not testable with Assertion Tester", +"td-default-safe","null","not testable with Assertion Tester", +"td-default-success","null","not testable with Assertion Tester", +"td-default-writeOnly","null","not testable with Assertion Tester", +"td-expectedResponse-contentType","null","not testable with Assertion Tester", +"td-expectedResponse-default-contentType","null","not testable with Assertion Tester", +"td-form-protocolbindings","null","not testable with Assertion Tester", +"td-format-validation-other-values","null","not testable with Assertion Tester", +"td-json-open","null","not testable with Assertion Tester", +"td-json-open_accept-byte-order","null","not testable with Assertion Tester", +"td-json-open_no-byte-order","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-no-multi","null","not testable with Assertion Tester", +"td-ns-multilanguage-content-negotiation-optional","null","not testable with Assertion Tester", +"td-processor-serialization","null","not testable with Assertion Tester", +"td-security-binding","null","not testable with Assertion Tester", +"td-security-in-query-over-uri","null","not testable with Assertion Tester", +"td-security-no-extras","null","not testable with Assertion Tester", +"td-security-no-secrets","null","not testable with Assertion Tester", +"td-vocabulary-defaults","null","not testable with Assertion Tester", +"well-known-operation-types-only","null","not testable with Assertion Tester", +"privacy-auth-users-only","null","not testable with Assertion Tester","Only authorized users SHOULD be provided access to the Thing Description for a Thing." +"privacy-centralized-ids","null","not testable with Assertion Tester","TD identifiers SHOULD NOT be generated using a centralized authority." +"privacy-essential-metadata-only","null","not testable with Assertion Tester","Only the amount of information needed for the level of authorization and the use case SHOULD be provided in a TD." +"privacy-immutable-id-as-property","null","not testable with Assertion Tester","Ideally, any required immutable identifiers SHOULD only be made available via affordances, such as a property, whose value can only be obtained after appropriate authentication and authorization, and managed separately from the TD identifier." +"privacy-mutable-identifiers","null","not testable with Assertion Tester","All identifiers used in a TD SHOULD be mutable, and in particular there SHOULD be a mechanism to update the id of a Thing when necessary." +"privacy-temp-id-metadata","null","not testable with Assertion Tester","Any temporary ID generated to manage TDs, for example an ID for a database or directory service, SHOULD NOT contain metadata describing the Thing or from the TD itself." +"sec-body-name-json-pointer-type","null","not testable with Assertion Tester","." +"sec-inj-no-intl-markup","null","not testable with Assertion Tester","HTML markup SHOULD NOT be used for internationalization purposes in TD strings." +"security-context-secure-fetch","null","not testable with Assertion Tester","If it is necessary to fetch a context definition file, an implementation SHOULD first attempt to use HTTP over TLS even when only an HTTP URL is given." +"security-jsonld-expansion","null","not testable with Assertion Tester","Consumers SHOULD set and enforce limits on memory usage to prevent buffer overflow and resource exhaustion during JSON-LD processing." +"security-mutual-auth-td","null","not testable with Assertion Tester","Thing Descriptions SHOULD be obtained only through mutually authenticated secure channels." +"security-no-execution","null","not testable with Assertion Tester","A WoT Thing Description JSON-LD serialization MUST NOT be passed through a code execution mechanism such as JavaScript's eval() function to be parsed." +"security-oauth-limits","null","not testable with Assertion Tester","To limit the scope and duration of access to Things, tokens SHOULD be used to manage access." +"security-remote-context","null","not testable with Assertion Tester","Constrained implementations SHOULD NOT follow links to remote contexts." +"security-server-auth-td","null","not testable with Assertion Tester","In cases where the Consumer is associated with a person, e.g. browsers, TDs MAY be obtained through a channel where only the TD provider is authenticated." +"security-static-context","null","not testable with Assertion Tester","Constrained implementations SHOULD use vetted versions of their supported context extensions managed statically or as part of a secure update process." +"td-context-ns-td10-namespacev10","null","not testable with Assertion Tester","TD 1.1 consumers MUST accept TDs satisfying the W3C WoT Thing Description 1.0 [[wot-thing-description]] specification." +"td-default-AdditionalResponseContentType","null","not testable with Assertion Tester","AdditionalExpectedResponse contentType value of the contentType of the Form element it belongs to." +"td-default-observable","null","not testable with Assertion Tester","PropertyAffordance observable false" +"td-processor-bidi-isolation","null","not testable with Assertion Tester","TD Processors SHOULD take care to use bidi isolation when presenting strings to users, particularly when embedding in surrounding text (e.g., for Web user interface)" +"td-producer-mixed-direction","null","not testable with Assertion Tester","TD producers SHOULD attempt to provide mixed direction strings in a way that can be displayed successfully by a naive user agent." +"td-security-extension","null","not testable with Assertion Tester","Additional security schemes MUST be Subclasses of the Class SecurityScheme." +"td-text-direction-first-strong","null","not testable with Assertion Tester","When metadata such as @direction is not present, TD Consumers SHOULD use [=first-strong detection=] as a fallback." +"td-text-direction-language-tag","null","not testable with Assertion Tester","For the MultiLanguage Map, TD Consumers MAY infer the [=base direction=] from the language tag of the individual strings." \ No newline at end of file diff --git a/packages/assertions/assertions-tm/manual.csv b/packages/assertions/assertions-tm/manual.csv index 4f2034bf9..7ab0a730f 100644 --- a/packages/assertions/assertions-tm/manual.csv +++ b/packages/assertions/assertions-tm/manual.csv @@ -1 +1,19 @@ -"ID","Status","Comment","Description" \ No newline at end of file +"ID","Status","Comment","Description" +"thing-model-td-generation-processor-extends","null","not testable with Assertion Tester","If used" +"thing-model-td-generation-processor-forms","null","not testable with Assertion Tester","Missing communication and/or security metadata details MUST be completed in the Thing Description instance based on Section and/or ." +"thing-model-td-generation-processor-imports","null","not testable with Assertion Tester","Copy all definitions from the input Thing Model to the resulting Partial TD instance. If used, the extension and imports feature MUST be resolved and represented in the Partial TD instance according to ." +"thing-model-td-generation-processor-optional","null","not testable with Assertion Tester","All optional interactions (listed in tm:optional) MAY be taken over to the Partial TD instance." +"thing-model-td-generation-processor-placeholder","null","not testable with Assertion Tester","If used, all placeholders (see Section ) in the Thing Model MUST be replaced with a valid corresponding value in the Partial TD." +"thing-model-td-generation-processor-required","null","not testable with Assertion Tester","All required interactions (not listed in tm:optional) MUST be taken over to the Partial TD instance." +"thing-model-td-generation-processor-type","null","not testable with Assertion Tester","The tm:ThingModel value of the top-level @type MUST be removed in the Partial TD instance." +"tm-derivation-validity","null","not testable with Assertion Tester","When a Thing Descriptions is instantiated by relying on a Thing Model, it SHOULD be valid according to that Thing Model." +"tm-overwrite-interaction","null","not testable with Assertion Tester","A Thing Model SHOULD NOT overwrite the JSON names defined within the properties, actions, and/or events Map of the extended Thing Model." +"tm-overwrite-types","null","not testable with Assertion Tester","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." +"tm-placeholder-replacement","null","not testable with Assertion Tester","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." +"tm-ref-recursive-extensions","null","not testable with Assertion Tester","Recursive extensions leading to an infinite loop MUST NOT be defined." +"tm-tmOptional-resolver","null","not testable with Assertion Tester","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." +"tm-tmRef-overwrite-possibility","null","not testable with Assertion Tester","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." +"tm-tmRef-overwrite-process","null","not testable with Assertion Tester","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." +"tm-tmRef-overwrite-semantic-meaning","null","not testable with Assertion Tester","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition." +"tm-tmRef2","null","not testable with Assertion Tester","Every time tm:ref is used, the referenced pre-definition and its dependencies (e.g., by context extension) MUST be assumed at the new defined definition." +"tm-versioning-1","null","not testable with Assertion Tester","When the Thing Model definitions change over time, this SHOULD be reflected in the version container." \ No newline at end of file From 756253fbc99eab8d9c476c1f8c5612b7762c5f2f Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 10:54:34 +0200 Subject: [PATCH 25/28] include tmoptional in assertion script --- packages/assertions/assertionTests-tm.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/assertions/assertionTests-tm.js b/packages/assertions/assertionTests-tm.js index f8c5322df..84b12a02f 100644 --- a/packages/assertions/assertionTests-tm.js +++ b/packages/assertions/assertionTests-tm.js @@ -15,10 +15,7 @@ const mergeIdenticalResults = require("./util").mergeIdenticalResults // Imports from playground core -// const checkUniqueness = require('@thing-description-playground/core').propUniqueness -// const checkMultiLangConsistency = require("@thing-description-playground/core").multiLangConsistency -// const checkSecurity = require("@thing-description-playground/core").security -// const checkLinksRelTypeCount = require("@thing-description-playground/core").checkLinksRelTypeCount +const checkTmOptionalPointer = require("@thing-description-playground/core").checkTmOptionalPointer const tmSchema = require("@thing-description-playground/core/tm-schema.json") const tmPlaceholderSchema = require("./assertions-tm/tm-placeholder.json") const tmRefSchema = require("./assertions-tm/tm-tmRef1.json") @@ -93,9 +90,7 @@ module.exports = validateTM } // additional checks - // results.push(...checkSecurity(tmJson)) - // results.push(...checkMultiLangConsistency(tmJson)) - // results.push(...checkLinksRelTypeCount(tmJson)) + results.push(...checkTmOptionalPointer(tmJson)) // Iterating through assertions for (let index = 0; index < assertions.length; index++) { From c304bb6ea539d6cbac17d86e8b28ba53ac72dbb6 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 10:55:04 +0200 Subject: [PATCH 26/28] remove unnecessary log --- packages/cli/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/index.js b/packages/cli/index.js index d64561768..1420ddb33 100644 --- a/packages/cli/index.js +++ b/packages/cli/index.js @@ -593,9 +593,9 @@ function defaultManipulation() { */ function extractName(pathLike) { // remove path if existing - console.log("Before: "+pathLike) + // console.log("Before: "+pathLike) pathLike = path.basename(pathLike) - console.log("After: "+pathLike) + // console.log("After: "+pathLike) // remove file ending if existing if (pathLike.indexOf(".") !== -1) { pathLike = pathLike.split(".") From 5538176971a4c161b118bd3de5364403f5c5d574 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 10:55:33 +0200 Subject: [PATCH 27/28] remove commented logs --- packages/core/shared.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/core/shared.js b/packages/core/shared.js index ef0f0d430..0763d3f97 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -133,7 +133,6 @@ function checkPropUniqueness(tdString) { const tdProperties = td.properties if (tdProperties.hasOwnProperty(interactionName)) { // duplicate was at properties but that fails the td-unique identifiers as well - // console.log("at property"); results.push({ "ID": "td-properties_uniqueness", "Status": "fail", @@ -162,7 +161,6 @@ function checkPropUniqueness(tdString) { const tdActions = td.actions if (tdActions.hasOwnProperty(interactionName)) { // duplicate was at actions but that fails the td-unique identifiers as well - // console.log("at action"); results.push({ "ID": "td-actions_uniqueness", "Status": "fail", @@ -189,7 +187,6 @@ function checkPropUniqueness(tdString) { const tdEvents = td.events if (tdEvents.hasOwnProperty(interactionName)) { // duplicate was at events but that fails the td-unique identifiers as well - // console.log("at event"); results.push({ "ID": "td-events_uniqueness", "Status": "fail", @@ -787,7 +784,7 @@ function checkUriSecurity(td) { if (curPropertyUriVariables.length>0){ // there are urivariables somewhere at least // below is from https://stackoverflow.com/a/1885569/3806426 const filteredArray = curPropertyUriVariables.filter(value => securityUriVariables.includes(value)) - console.log(curPropertyUriVariables,"\n",securityUriVariables,"\n",filteredArray) + // console.log(curPropertyUriVariables,"\n",securityUriVariables,"\n",filteredArray) if(filteredArray.length>0){ uriVariablesDistinctResult = "fail" } else { @@ -828,7 +825,7 @@ function checkUriSecurity(td) { if (curActionUriVariables.length>0){ // there are urivariables somewhere at least // below is from https://stackoverflow.com/a/1885569/3806426 const filteredArray = curActionUriVariables.filter(value => securityUriVariables.includes(value)) - console.log(curActionUriVariables,"\n",securityUriVariables,"\n",filteredArray) + // console.log(curActionUriVariables,"\n",securityUriVariables,"\n",filteredArray) if(filteredArray.length>0){ uriVariablesDistinctResult = "fail" } else { @@ -869,7 +866,7 @@ function checkUriSecurity(td) { if (curEventUriVariables.length>0){ // there are urivariables somewhere at least // below is from https://stackoverflow.com/a/1885569/3806426 const filteredArray = curEventUriVariables.filter(value => securityUriVariables.includes(value)) - console.log(curEventUriVariables,"\n",securityUriVariables,"\n",filteredArray) + // console.log(curEventUriVariables,"\n",securityUriVariables,"\n",filteredArray) if(filteredArray.length>0){ uriVariablesDistinctResult = "fail" } else { From 51f14c0a873876e62fe4a5149841dd50af5ad77f Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 7 Oct 2022 10:55:59 +0200 Subject: [PATCH 28/28] remove redundant manual assertion --- packages/assertions/assertions-tm/manual.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/assertions/assertions-tm/manual.csv b/packages/assertions/assertions-tm/manual.csv index 7ab0a730f..712e7a872 100644 --- a/packages/assertions/assertions-tm/manual.csv +++ b/packages/assertions/assertions-tm/manual.csv @@ -11,7 +11,6 @@ "tm-overwrite-types","null","not testable with Assertion Tester","Definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin extended definitions." "tm-placeholder-replacement","null","not testable with Assertion Tester","The placeholder labeling MUST be substituted with a concrete value (e.g., as JSON number, JSON string, JSON object, etc) when TD instance is created from the Thing Model." "tm-ref-recursive-extensions","null","not testable with Assertion Tester","Recursive extensions leading to an infinite loop MUST NOT be defined." -"tm-tmOptional-resolver","null","not testable with Assertion Tester","The JSON Pointers of tm:optional MUST resolve to an entire interaction affordance Map definition." "tm-tmRef-overwrite-possibility","null","not testable with Assertion Tester","If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value." "tm-tmRef-overwrite-process","null","not testable with Assertion Tester","The process to overwrite MUST follow the JSON Merge Patch algorithm as defined in [RFC7396] where the content of the referenced definition is patched with the new provided JSON name-value pairs." "tm-tmRef-overwrite-semantic-meaning","null","not testable with Assertion Tester","Similar to tm:extends and to keep the semantic meaning, definitions SHOULD NOT be overwritten in such a way that possible instance values are no longer valid compared to the origin referenced definition."