diff --git a/context/json-ld.js b/context/json-ld.js index 6f39644bb..e5c8a7b76 100644 --- a/context/json-ld.js +++ b/context/json-ld.js @@ -37,7 +37,9 @@ function context(obj, id) { txt += `_:${scope}${k} <${ld}term> "${k}" .\r\n`; let iri = fullIRI(v instanceof Object ? v['@id'] : v, ctx); - txt+= `_:${scope}${k} <${ld}iri> <${iri}> .\r\n`; + if (!iri.startsWith('@')) { + txt+= `_:${scope}${k} <${ld}iri> <${iri}> .\r\n`; + } if (v instanceof Object) { if (v['@container']) { diff --git a/context/td-context-1.1.jsonld b/context/td-context-1.1.jsonld index ae3663819..32924912f 100644 --- a/context/td-context-1.1.jsonld +++ b/context/td-context-1.1.jsonld @@ -1 +1 @@ -{"@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdfs":"http://www.w3.org/2000/01/rdf-schema#","xsd":"http://www.w3.org/2001/XMLSchema#","license":{"@id":"http://purl.org/dc/terms/license"},"id":"@id","properties":{"@id":"td:properties","@type":"@id","@container":"@index","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"actions":{"@id":"td:actions","@type":"@id","@container":"@index"},"events":{"@id":"td:events","@type":"@id","@container":"@index"},"security":{"@id":"td:security","@type":"@id","@container":"@set","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","in":{"@id":"wotsec:in"},"authorization":{"@id":"wotsec:authorization"},"token":{"@id":"wotsec:token"},"refresh":{"@id":"wotsec:refresh"},"proxy":{"@id":"wotsec:proxy"},"scopes":{"@id":"wotsec:scopes","@container":"@set"},"flow":{"@id":"wotsec:flow"},"qop":{"@id":"wotsec:qop"},"alg":{"@id":"wotsec:alg"},"format":{"@id":"wotsec:format"},"identity":{"@id":"wotsec:identity"},"scheme":{"@id":"rdf:type","@type":"@vocab"},"nosec":"wotsec:NoSecurityScheme","basic":"wotsec:BasicSecurityScheme","digest":"wotsec:DigestSecurityScheme","apikey":"wotsec:APIKeySecurityScheme","bearer":"wotsec:BearerSecurityScheme","cert":"wotsec:CertSecurityScheme","psk":"wotsec:PSKSecurityScheme","public":"wotsec:PublicSecurityScheme","pop":"wotsec:PoPSecurityScheme","oauth2":"wotsec:OAuth2SecurityScheme"}},"securityDefinitions":{"@id":"td:securityDefinitions","@type":"@id","@container":"@index"},"Thing":{"@id":"td:Thing"},"label":{"@id":"td:label"},"Event":{"@id":"td:Event"},"base":{"@id":"td:base","@type":"xsd:anyURI"},"href":{"@id":"td:href","@type":"xsd:anyURI"},"name":{"@id":"td:name"},"created":{"@id":"td:created"},"lastModified":{"@id":"td:lastModified"},"observable":{"@id":"td:observable","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"Versioning":{"@id":"td:Versioning"},"SecurityScheme":{"@id":"td:SecurityScheme"},"Property":{"@id":"td:Property"},"forms":{"@id":"td:forms","@type":"@id","@container":"@set"},"version":{"@id":"td:version","@type":"@id"},"links":{"@id":"td:links","@type":"@id","@container":"@set","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdfs":"http://www.w3.org/2000/01/rdf-schema#","xsd":"http://www.w3.org/2001/XMLSchema#","Link":{"@id":"lnk:Link"},"Form":{"@id":"lnk:Form"},"op":{"@id":"lnk:op"},"subprotocol":{"@id":"lnk:subprotocol"},"contentType":{"@id":"lnk:contentType","@type":"xsd:string"},"contentCoding":{"@id":"lnk:contentCoding","@type":"xsd:string"},"anchor":{"@id":"lnk:anchor"},"href":{"@id":"lnk:href"},"rel":{"@id":"lnk:rel"},"type":{"@id":"lnk:type"}}},"uriVariables":{"@id":"td:uriVariables","@container":"@index"},"instance":{"@id":"td:instance"},"safe":{"@id":"td:safe"},"idempotent":{"@id":"td:idempotent"},"InteractionPattern":{"@id":"td:InteractionPattern"},"Action":{"@id":"td:Action"},"input":{"@id":"td:input","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"output":{"@id":"td:output","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"subscription":{"@id":"td:subscription","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"data":{"@id":"td:data","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"cancellation":{"@id":"td:cancellation","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"description":{"@id":"td:description"},"descriptions":{"@id":"td:descriptions","@container":"@language"},"title":{"@id":"td:title"},"support":{"@id":"td:support"},"@version":1.1}} \ No newline at end of file +{"@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdfs":"http://www.w3.org/2000/01/rdf-schema#","xsd":"http://www.w3.org/2001/XMLSchema#","license":{"@id":"http://purl.org/dc/terms/license"},"id":"@id","properties":{"@id":"td:properties","@type":"@id","@container":"@index","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"actions":{"@id":"td:actions","@type":"@id","@container":"@index"},"events":{"@id":"td:events","@type":"@id","@container":"@index"},"security":{"@id":"td:security","@type":"@id","@container":"@set","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","in":{"@id":"wotsec:in"},"authorization":{"@id":"wotsec:authorization"},"token":{"@id":"wotsec:token"},"refresh":{"@id":"wotsec:refresh"},"proxy":{"@id":"wotsec:proxy"},"scopes":{"@id":"wotsec:scopes","@container":"@set"},"flow":{"@id":"wotsec:flow"},"qop":{"@id":"wotsec:qop"},"alg":{"@id":"wotsec:alg"},"format":{"@id":"wotsec:format"},"identity":{"@id":"wotsec:identity"},"scheme":{"@id":"rdf:type","@type":"@vocab"},"nosec":"wotsec:NoSecurityScheme","basic":"wotsec:BasicSecurityScheme","digest":"wotsec:DigestSecurityScheme","apikey":"wotsec:APIKeySecurityScheme","bearer":"wotsec:BearerSecurityScheme","cert":"wotsec:CertSecurityScheme","psk":"wotsec:PSKSecurityScheme","public":"wotsec:PublicSecurityScheme","pop":"wotsec:PoPSecurityScheme","oauth2":"wotsec:OAuth2SecurityScheme"}},"securityDefinitions":{"@id":"td:securityDefinitions","@type":"@id","@container":"@index"},"Thing":{"@id":"td:Thing"},"label":{"@id":"td:label"},"Event":{"@id":"td:Event"},"base":{"@id":"td:base","@type":"xsd:anyURI"},"href":{"@id":"td:href","@type":"xsd:anyURI"},"name":{"@id":"td:name"},"created":{"@id":"td:created"},"lastModified":{"@id":"td:lastModified"},"observable":{"@id":"td:observable","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"Versioning":{"@id":"td:Versioning"},"SecurityScheme":{"@id":"td:SecurityScheme"},"Property":{"@id":"td:Property"},"forms":{"@id":"td:forms","@type":"@id","@container":"@set"},"version":{"@id":"td:version","@type":"@id"},"links":{"@id":"td:links","@type":"@id","@container":"@set","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdfs":"http://www.w3.org/2000/01/rdf-schema#","xsd":"http://www.w3.org/2001/XMLSchema#","Link":{"@id":"lnk:Link"},"Form":{"@id":"lnk:Form"},"op":{"@id":"lnk:forOperationType"},"subprotocol":{"@id":"lnk:forSubProtocol"},"contentType":{"@id":"lnk:forContentType","@type":"xsd:string"},"contentCoding":{"@id":"lnk:forContentCoding","@type":"xsd:string"},"anchor":{"@id":"lnk:hasAnchor"},"href":{"@id":"lnk:hasTarget"},"rel":{"@id":"lnk:hasRelationType"},"type":{"@id":"lnk:hintsAtMediaType"},"response":{"@id":"lnk:returns"}}},"uriVariables":{"@id":"td:uriVariables","@container":"@index"},"instance":{"@id":"td:instance"},"safe":{"@id":"td:safe"},"idempotent":{"@id":"td:idempotent"},"InteractionPattern":{"@id":"td:InteractionPattern"},"Action":{"@id":"td:Action"},"input":{"@id":"td:input","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"output":{"@id":"td:output","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"subscription":{"@id":"td:subscription","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"data":{"@id":"td:data","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"cancellation":{"@id":"td:cancellation","@type":"@id","@context":{"td":"https://www.w3.org/2019/td#","jsonschema":"https://www.w3.org/2019/json-schema#","wotsec":"https://www.w3.org/2019/wot-security#","lnk":"https://www.w3.org/2019/web-linking#","rdf":"http://www.w3.org/1999/02/22-rdf-syntax-ns#","DataSchema":{"@id":"jsonschema:DataSchema"},"readOnly":{"@id":"jsonschema:readOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"writeOnly":{"@id":"jsonschema:writeOnly","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"maximum":{"@id":"jsonschema:maximum"},"minimum":{"@id":"jsonschema:minimum"},"maxItems":{"@id":"jsonschema:maxItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"minItems":{"@id":"jsonschema:minItems","@type":"http://www.w3.org/2001/XMLSchema#decimal"},"items":{"@id":"jsonschema:items","@type":"@id"},"required":{"@id":"jsonschema:required","@type":"http://www.w3.org/2001/XMLSchema#string","@container":"@set"},"enum":{"@id":"jsonschema:enum","@type":"@id","@container":"@set"},"const":{"@id":"jsonschema:const"},"unit":{"@id":"jsonschema:unit"},"oneOf":{"@id":"jsonschema:oneOf","@container":"@set"},"type":{"@id":"rdf:type","@type":"@vocab"},"object":"jsonschema:ObjectSchema","array":"jsonschema:ArraySchema","boolean":"jsonschema:BooleanSchema","string":"jsonschema:StringSchema","number":"jsonschema:NumberSchema","integer":"jsonschema:IntegerSchema","null":"jsonschema:NullSchema","properties":{"@id":"jsonschema:properties","@type":"@id","@container":"@index"}}},"description":{"@id":"td:description"},"descriptions":{"@id":"td:descriptions","@container":"@language"},"title":{"@id":"td:title"},"support":{"@id":"td:support"},"@version":1.1}} \ No newline at end of file diff --git a/context/web-linking-context.jsonld b/context/web-linking-context.jsonld index eb84f13f9..22a10c3f3 100644 --- a/context/web-linking-context.jsonld +++ b/context/web-linking-context.jsonld @@ -13,30 +13,33 @@ "@id" : "lnk:Form" }, "op" : { - "@id" : "lnk:op" + "@id" : "lnk:forOperationType" }, "subprotocol" : { - "@id" : "lnk:subprotocol" + "@id" : "lnk:forSubProtocol" }, "contentType" : { - "@id" : "lnk:contentType", + "@id" : "lnk:forContentType", "@type": "xsd:string" }, "contentCoding" : { - "@id" : "lnk:contentCoding", + "@id" : "lnk:forContentCoding", "@type": "xsd:string" }, "anchor" : { - "@id" : "lnk:anchor" + "@id" : "lnk:hasAnchor" }, "href" : { - "@id" : "lnk:href" + "@id" : "lnk:hasTarget" }, "rel" : { - "@id" : "lnk:rel" + "@id" : "lnk:hasRelationType" }, "type" : { - "@id" : "lnk:type" + "@id" : "lnk:hintsAtMediaType" + }, + "response": { + "@id": "lnk:returns" } } } diff --git a/index.html b/index.html index bbf995585..d73124b7b 100644 --- a/index.html +++ b/index.html @@ -1634,7 +1634,7 @@

Web Linking Vocabulary Definitions

well-known types necessary to implement the WoT interaction model described in [[WOT-ARCHITECTURE]]. Future versions of the standard may extend this list but -operations types SHOULD NOT be arbitrary set by servients +operations types SHOULD NOT be arbitrarily set by servients .

diff --git a/ontology/jsonschema.html b/ontology/jsonschema.html index d8dae3fc3..ff5b0dfea 100644 --- a/ontology/jsonschema.html +++ b/ontology/jsonschema.html @@ -88,28 +88,28 @@

Introduction

jsonschema:maxItems

IRI: https://www.w3.org/2019/json-schema#maxItems

a OWL Class

maxItems - Defines the maximum number of items that have to be in the array.

jsonschema:required

IRI: https://www.w3.org/2019/json-schema#required

a OWL Class

required - Defines which members of the object type are mandatory.

jsonschema:readOnly

IRI: https://www.w3.org/2019/json-schema#readOnly

a OWL Class

readOnly - Boolean value that is a hint to indicate whether a property interaction / value is read only (=true) or not (=false)
-

jsonschema:oneOf

IRI: https://www.w3.org/2019/json-schema#oneOf

a OWL Class

oneOf - Used to ensure that the data is valid against one of the specified schemas in the array.

Term Mapping

- - +

jsonschema:oneOf

IRI: https://www.w3.org/2019/json-schema#oneOf

a OWL Class

oneOf - Used to ensure that the data is valid against one of the specified schemas in the array.
JSON StringOntology Term
stringjsonschema:StringSchema
nulljsonschema:NullSchema
propertiesjsonschema:properties

Term Mapping

- - + - - - - + + + + + + - - - + - - - -
JSON StringOntology Term
DataSchemajsonschema:DataSchema
objectjsonschema:ObjectSchema
maximumjsonschema:maximum
readOnlyjsonschema:readOnly
arrayjsonschema:ArraySchema
writeOnlyjsonschema:writeOnly
unitjsonschema:unit
numberjsonschema:NumberSchema
enumjsonschema:enum
oneOfjsonschema:oneOf
jsonschemajsonschema:
itemsjsonschema:items
minimumjsonschema:minimum
minItemsjsonschema:minItems
integerjsonschema:IntegerSchema
numberjsonschema:NumberSchema
maxItemsjsonschema:maxItems
booleanjsonschema:BooleanSchema
requiredjsonschema:required
minItemsjsonschema:minItems
minimumjsonschema:minimum
jsonschemajsonschema:
readOnlyjsonschema:readOnly
constjsonschema:const
arrayjsonschema:ArraySchema
DataSchemajsonschema:DataSchema
booleanjsonschema:BooleanSchema
itemsjsonschema:items
+nulljsonschema:NullSchema +maximumjsonschema:maximum +unitjsonschema:unit +stringjsonschema:StringSchema +oneOfjsonschema:oneOf +enumjsonschema:enum +propertiesjsonschema:properties diff --git a/ontology/lnk.html b/ontology/lnk.html index e386c4f99..eecc765aa 100644 --- a/ontology/lnk.html +++ b/ontology/lnk.html @@ -69,36 +69,37 @@

Introduction

-

Axiomatization

Overview of Classes and Properties

Classes: lnk:ExpectedResponse , lnk:Link , lnk:Form

Object Properties:

Datatype Properties: lnk:type , lnk:op , lnk:rel , lnk:subprotocol , lnk:contentType , lnk:response , lnk:href , lnk:contentCoding , lnk:anchor

Classes

lnk:ExpectedResponse

IRI: https://www.w3.org/2019/web-linking#ExpectedResponse

a OWL Class

ExpectedResponse - Communication metadata for response messages (e.g., contentType of the response).
+

Axiomatization

Overview of Classes and Properties

Classes: lnk:ExpectedResponse , lnk:Link , lnk:Form

Object Properties:

Datatype Properties: lnk:hintsAtMediaType , lnk:hasTarget , lnk:forContentType , lnk:returns , lnk:hasAnchor , lnk:forSubProtocol , lnk:forContentCoding , lnk:forOperationType , lnk:hasRelationType

Classes

lnk:ExpectedResponse

IRI: https://www.w3.org/2019/web-linking#ExpectedResponse

a OWL Class

ExpectedResponse - Communication metadata for response messages (e.g., contentType of the response).

lnk:Link

IRI: https://www.w3.org/2019/web-linking#Link

a OWL Class

Link - A link can be viewed as a statement of the form "link context has a link relation type resource at link target, which has target attributes".
-

lnk:Form

IRI: https://www.w3.org/2019/web-linking#Form

a OWL Class

Form - Communication metadata indicating where a service can be accessed by a client application. An interaction might have more than one form.

Object Properties

Datatype Properties

lnk:type

IRI: https://www.w3.org/2019/web-linking#type

a OWL Class

type - Target attribute providing a hint indicating what the media type [IANA-MEDIA-TYPES] of the result of dereferencing the link should be.
-

lnk:op

IRI: https://www.w3.org/2019/web-linking#op

a OWL Class

op - Indicates the semantic intention of performing the operation(s) described by the form. +

lnk:Form

IRI: https://www.w3.org/2019/web-linking#Form

a OWL Class

Form - Communication metadata indicating where a service can be accessed by a client application. An interaction might have more than one form.

Object Properties

Datatype Properties

lnk:hintsAtMediaType

IRI: https://www.w3.org/2019/web-linking#hintsAtMediaType

a OWL Class

hintsAtMediaType - Target attribute providing a hint indicating what the media type [IANA-MEDIA-TYPES] of the result of dereferencing the link should be.
+

lnk:hasTarget

IRI: https://www.w3.org/2019/web-linking#hasTarget

a OWL Class

hasTarget - target IRI of a link or submission target of a form.
+

lnk:forContentType

IRI: https://www.w3.org/2019/web-linking#forContentType

a OWL Class

forContentType - Assign a content type based on a media type [[IANA-MEDIA-TYPES]] (e.g., 'application/json) and (optional) parameters (e.g., 'charset=utf-8')
+

lnk:returns

IRI: https://www.w3.org/2019/web-linking#returns

a OWL Class

returns - 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.
+

lnk:hasAnchor

IRI: https://www.w3.org/2019/web-linking#hasAnchor

a OWL Class

hasAnchor - By default, the context, or anchor, of a link conveyed in the Link header field is the URL of the representation it is associated with, as defined in RFC7231, Section 3.1.4.1, and is serialized as a URI.
+

lnk:forSubProtocol

IRI: https://www.w3.org/2019/web-linking#forSubProtocol

a OWL Class

forSubProtocol - 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, websub (also see https://www.w3.org/TR/websub/), or server sent events (also see https://www.w3.org/TR/eventsource/). Please note that there is no restriction on the sub-protocol selection and other mechanisms can also be announced by this subprotocol term.
+

lnk:forContentCoding

IRI: https://www.w3.org/2019/web-linking#forContentCoding

a OWL Class

forContentCoding - 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. Examples of content coding include "gzip", "deflate", etc.
+

lnk:forOperationType

IRI: https://www.w3.org/2019/web-linking#forOperationType

a OWL Class

forOperationType - Indicates the semantic intention of performing the operation(s) 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 for which and allows the client to select the correct form for the operation required. op can be assigned one or more interaction verb(s) each representing a semantic intention of an operation.
-

lnk:rel

IRI: https://www.w3.org/2019/web-linking#rel

a OWL Class

rel - A link relation type identifies the semantics of a link.
-

lnk:subprotocol

IRI: https://www.w3.org/2019/web-linking#subprotocol

a OWL Class

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, websub (also see https://www.w3.org/TR/websub/), or server sent events (also see https://www.w3.org/TR/eventsource/). Please note that there is no restriction on the sub-protocol selection and other mechanisms can also be announced by this subprotocol term.
-

lnk:contentType

IRI: https://www.w3.org/2019/web-linking#contentType

a OWL Class

contentType - Assign a content type based on a media type [[IANA-MEDIA-TYPES]] (e.g., 'application/json) and (optional) parameters (e.g., 'charset=utf-8')
-

lnk:response

IRI: https://www.w3.org/2019/web-linking#response

a OWL Class

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.
-

lnk:href

IRI: https://www.w3.org/2019/web-linking#href

a OWL Class

href - target IRI of a link or submission target of a form.
-

lnk:contentCoding

IRI: https://www.w3.org/2019/web-linking#contentCoding

a OWL Class

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. Examples of content coding include "gzip", "deflate", etc.
-

lnk:anchor

IRI: https://www.w3.org/2019/web-linking#anchor

a OWL Class

anchor - By default, the context, or anchor, of a link conveyed in the Link header field is the URL of the representation it is associated with, as defined in RFC7231, Section 3.1.4.1, and is serialized as a URI.

Term Mapping

- - - - - - - +

lnk:hasRelationType

IRI: https://www.w3.org/2019/web-linking#hasRelationType

a OWL Class

hasRelationType - A link relation type identifies the semantics of a link.
JSON StringOntology Term
lnklnk:
contentCodinglnk:contentCoding
contentTypelnk:contentType
typelnk:type
Formlnk:Form
hreflnk:href
rellnk:rel
subprotocollnk:subprotocol

Term Mapping

- -
JSON StringOntology Term
typelnk:hintsAtMediaType
Linklnk:Link
oplnk:op
anchorlnk:anchor
+lnklnk: +contentTypelnk:forContentType +rellnk:hasRelationType +responselnk:returns +Formlnk:Form +subprotocollnk:forSubProtocol +hreflnk:hasTarget +anchorlnk:hasAnchor +contentCodinglnk:forContentCoding +oplnk:forOperationType
diff --git a/ontology/td.html b/ontology/td.html index 132ee4729..b42c81b71 100644 --- a/ontology/td.html +++ b/ontology/td.html @@ -103,42 +103,42 @@

Introduction

td:name

IRI: https://www.w3.org/2019/td#name

a OWL Class

name - Name of the Thing.

td:base

IRI: https://www.w3.org/2019/td#base

a OWL Class

base - Define the base URI that is used for all relative URI references throughout a TD document. In TD instances, all relative URIs are resolved relative to the base URI using the algorithm defined in [[RFC3986]].

td:unit

IRI: https://www.w3.org/2019/td#unit

a OWL Class

unit - Provides unit information that is used, e.g., in international science, engineering, and business.
-

td:instance

IRI: https://www.w3.org/2019/td#instance

a OWL Class

instance - Provides a version identicator of this TD instance.

Term Mapping

- - +

td:instance

IRI: https://www.w3.org/2019/td#instance

a OWL Class

instance - Provides a version identicator of this TD instance.
JSON StringOntology Term
tdtd:
securitytd:security
inputtd:input

Term Mapping

+ + + + + - - - - - + + + + - - - - - - + + + + + + - - - + + + + - - + - - - + - - + - -
JSON StringOntology Term
datatd:data
actionstd:actions
Actiontd:Action
hreftd:href
idempotenttd:idempotent
tdtd:
versiontd:version
securityDefinitionstd:securityDefinitions
Propertytd:Property
propertiestd:properties
Versioningtd:Versioning
InteractionPatterntd:InteractionPattern
labeltd:label
descriptiontd:description
descriptionstd:descriptions
createdtd:created
observabletd:observable
linkstd:links
actionstd:actions
basetd:base
instancetd:instance
nametd:name
eventstd:events
hreftd:href
observabletd:observable
SecuritySchemetd:SecurityScheme
supporttd:support
propertiestd:properties
Versioningtd:Versioning
Propertytd:Property
instancetd:instance
cancellationtd:cancellation
outputtd:output
versiontd:version
idempotenttd:idempotent
subscriptiontd:subscription
basetd:base
securitytd:security
labeltd:label
Thingtd:Thing
safetd:safe
descriptionstd:descriptions
formstd:forms
eventstd:events
Eventtd:Event
datatd:data
cancellationtd:cancellation
supporttd:support
subscriptiontd:subscription
titletd:title
createdtd:created
uriVariablestd:uriVariables
inputtd:input
lastModifiedtd:lastModified
Thingtd:Thing
descriptiontd:description
+uriVariablestd:uriVariables +InteractionPatterntd:InteractionPattern +formstd:forms

Examples

diff --git a/ontology/web-linking.ttl b/ontology/web-linking.ttl index e77139eb7..653054183 100644 --- a/ontology/web-linking.ttl +++ b/ontology/web-linking.ttl @@ -14,47 +14,47 @@ ################################################################# ### https://www.w3.org/2019/web-linking#anchor -:anchor rdf:type owl:DatatypeProperty ; +:hasAnchor rdf:type owl:DatatypeProperty ; rdfs:comment "By default, the context, or anchor, of a link conveyed in the Link header field is the URL of the representation it is associated with, as defined in RFC7231, Section 3.1.4.1, and is serialized as a URI." ; - rdfs:label "anchor" . + rdfs:label "hasAnchor" . ### https://www.w3.org/2019/web-linking#href -:href rdf:type owl:DatatypeProperty ; +:hasTarget rdf:type owl:DatatypeProperty ; rdfs:comment "target IRI of a link or submission target of a form." ; - rdfs:label "href" . + rdfs:label "hasTarget" . ### https://www.w3.org/2019/web-linking#rel -:rel rdf:type owl:DatatypeProperty ; +:hasRelationType rdf:type owl:DatatypeProperty ; rdfs:comment "A link relation type identifies the semantics of a link." ; - rdfs:label "rel" . + rdfs:label "hasRelationType" . ### https://www.w3.org/2019/web-linking#type -:type rdf:type owl:DatatypeProperty ; +:hintsAtMediaType rdf:type owl:DatatypeProperty ; rdfs:comment "Target attribute providing a hint indicating what the media type [IANA-MEDIA-TYPES] of the result of dereferencing the link should be." ; - rdfs:label "type" . + rdfs:label "hintsAtMediaType" . ### https://www.w3.org/2019/web-linking#contentType -:contentType rdf:type owl:DatatypeProperty ; +:forContentType rdf:type owl:DatatypeProperty ; - rdfs:label "contentType" ; + rdfs:label "forContentType" ; rdfs:comment "Assign a content type based on a media type [[IANA-MEDIA-TYPES]] (e.g., 'application/json) and (optional) parameters (e.g., 'charset=utf-8')"@en . -:contentCoding rdf:type owl:DatatypeProperty ; - rdfs:label "contentCoding" ; +:forContentCoding rdf:type owl:DatatypeProperty ; + rdfs:label "forContentCoding" ; rdfs:comment "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. Examples of content coding include \"gzip\", \"deflate\", etc. "@en . ### https://www.w3.org/2019/web-linking#subprotocol -:subprotocol rdf:type owl:DatatypeProperty ; +:forSubProtocol rdf:type owl:DatatypeProperty ; - rdfs:label "subprotocol" ; + rdfs:label "forSubProtocol" ; rdfs:comment """Indicates the exact mechanism by which an interaction will be accomplished for a given protocol when there are multiple options. @@ -62,9 +62,9 @@ For example, for HTTP and Events, it indicates which of several available mechan ### https://www.w3.org/2019/web-linking#op -:op rdf:type owl:DatatypeProperty ; +:forOperationType rdf:type owl:DatatypeProperty ; - rdfs:label "op" ; + rdfs:label "forOperationType" ; rdfs:comment """Indicates the semantic intention of performing the operation(s) described by the form. @@ -77,9 +77,9 @@ op can be assigned one or more interaction verb(s) each representing a semantic ### https://www.w3.org/2019/web-linking#response -:response rdf:type owl:DatatypeProperty ; +:returns rdf:type owl:DatatypeProperty ; - rdfs:label "response" ; + rdfs:label "returns" ; rdfs:comment """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."""@en . diff --git a/ontology/wotsec.html b/ontology/wotsec.html index 9c605262b..aea3c2f7b 100644 --- a/ontology/wotsec.html +++ b/ontology/wotsec.html @@ -90,28 +90,28 @@

Introduction

wotsec:proxy

IRI: https://www.w3.org/2019/wot-security#proxy

a OWL Class

proxy - URI of the proxy server this security configuration provides access to. If not given, the corresponding security configuration is for the endpoint.

wotsec:scheme

IRI: https://www.w3.org/2019/wot-security#scheme

a OWL Class

scheme - Identification of security mechanism being configured.

wotsec:name

IRI: https://www.w3.org/2019/wot-security#name

a OWL Class

name - Name for query, header, or cookie parameters.
-

wotsec:token

IRI: https://www.w3.org/2019/wot-security#token

a OWL Class

token - URI of the token server.

Term Mapping

- - - - - - +

wotsec:token

IRI: https://www.w3.org/2019/wot-security#token

a OWL Class

token - URI of the token server.
JSON StringOntology Term
wotsecwotsec:
algwotsec:alg
digestwotsec:DigestSecurityScheme
oauth2wotsec:OAuth2SecurityScheme
authorizationwotsec:authorization
scopeswotsec:scopes
qopwotsec:qop

Term Mapping

- - - + + - + - - - + + + + + + + + + + -
JSON StringOntology Term
publicwotsec:PublicSecurityScheme
identitywotsec:identity
proxywotsec:proxy
bearerwotsec:BearerSecurityScheme
popwotsec:PoPSecurityScheme
wotsecwotsec:
algwotsec:alg
formatwotsec:format
certwotsec:CertSecurityScheme
tokenwotsec:token
flowwotsec:flow
refreshwotsec:refresh
apikeywotsec:APIKeySecurityScheme
basicwotsec:BasicSecurityScheme
nosecwotsec:NoSecurityScheme
publicwotsec:PublicSecurityScheme
apikeywotsec:APIKeySecurityScheme
qopwotsec:qop
certwotsec:CertSecurityScheme
proxywotsec:proxy
scopeswotsec:scopes
authorizationwotsec:authorization
popwotsec:PoPSecurityScheme
pskwotsec:PSKSecurityScheme
oauth2wotsec:OAuth2SecurityScheme
bearerwotsec:BearerSecurityScheme
digestwotsec:DigestSecurityScheme
inwotsec:in
flowwotsec:flow
+nosecwotsec:NoSecurityScheme diff --git a/render.js b/render.js index 623e35595..89955a449 100644 --- a/render.js +++ b/render.js @@ -118,7 +118,6 @@ load(updateEndpoint, null) }).concat(ctxFiles.map(f => { const context = fs.readFileSync(f, 'UTF-8'); let ttl = jsonld.toRDF(JSON.parse(context)); - console.log(ttl) return load(updateEndpoint, ttl); })); diff --git a/templates.txt b/templates.txt index f8ca0db78..5db36d998 100644 --- a/templates.txt +++ b/templates.txt @@ -359,7 +359,7 @@ template :label(?term) { ?m a jsonld:Mapping ; jsonld:iri ?term ; jsonld:term ?name . - filter not exists { ?iri a owl:Class } + filter not exists { ?term a owl:Class } } bind (if(bound(?name), ?name, strafter(str(?term), "#")) as ?label) } diff --git a/validation/td-validation.ttl b/validation/td-validation.ttl index ea6459cbd..f5a5cc9a7 100644 --- a/validation/td-validation.ttl +++ b/validation/td-validation.ttl @@ -312,7 +312,7 @@ well-known types necessary to implement the WoT interaction model described in [[WOT-ARCHITECTURE]]. Future versions of the standard may extend this list but -operations types SHOULD NOT be arbitrary set by servients +operations types SHOULD NOT be arbitrarily set by servients .

"""^^rdf:HTML ; @@ -324,30 +324,30 @@ IANA HTTP content coding registry.

"""^^rdf:HTML ; sh:property [ - sh:path lnk:href ; + sh:path lnk:hasTarget ; sh:minCount 1 ; sh:datatype xsd:anyURI ; sh:order "1"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:contentType ; + sh:path lnk:forContentType ; sh:datatype xsd:string ; sh:minCount 1 ; sh:defaultValue "application/json"^^xsd:string ; sh:order "2"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:contentCoding ; + sh:path lnk:forContentCoding ; sh:datatype xsd:string ; sh:order "3"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:response ; + sh:path lnk:returns ; sh:class lnk:ExpectedResponse ; sh:order "4"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:op ; + sh:path lnk:forOperationType ; sh:minCount 1 ; sh:datatype xsd:string ; sh:in ( @@ -366,7 +366,7 @@ IANA HTTP content coding registry. sh:order "5"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:subprotocol ; + sh:path lnk:forSubProtocol ; sh:datatype xsd:string ; sh:in ( "longpoll" @@ -392,23 +392,23 @@ IANA HTTP content coding registry. sh:closed "false"^^xsd:boolean ; sh:order "7"^^xsd:integer ; sh:property [ - sh:path lnk:href ; + sh:path lnk:hasTarget ; sh:minCount 1 ; sh:datatype xsd:anyURI ; sh:order "1"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:type ; + sh:path lnk:hintsAtMediaType ; sh:datatype xsd:string ; sh:order "2"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:rel ; + sh:path lnk:hasRelationType ; sh:datatype xsd:string ; sh:order "3"^^xsd:integer ; ] ; sh:property [ - sh:path lnk:anchor ; + sh:path lnk:hasAnchor ; sh:datatype xsd:anyURI ; sh:order "4"^^xsd:integer ; ] . @@ -428,7 +428,7 @@ IANA HTTP content coding registry. sh:closed "false"^^xsd:boolean ; sh:order "9"^^xsd:integer ; sh:property [ - sh:path lnk:contentType ; + sh:path lnk:forContentType ; sh:datatype xsd:string ; sh:minCount 1 ; sh:defaultValue "application/json"^^xsd:string ; diff --git a/visualization/json-schema.svg b/visualization/json-schema.svg index c5fac5a78..ccdac74f3 100644 --- a/visualization/json-schema.svg +++ b/visualization/json-schema.svg @@ -17,12 +17,12 @@ IntegerSchema -minimum +maximum : integer -maximum +minimum : integer @@ -40,9 +40,9 @@ string -type - : -string +format + : +string title @@ -50,24 +50,24 @@ string -writeOnly - : -boolean +description + : +string -readOnly - : -boolean +type + : +string -description - : -string +writeOnly + : +boolean -format - : -string +readOnly + : +boolean @@ -195,50 +195,50 @@ - + DataSchema->DataSchema oneOf 0..* - + +string + + +string + + + +DataSchema->string + + +unit +0..1 + + + MultiLanguage - - -MultiLanguage + + +MultiLanguage - + DataSchema->MultiLanguage - - -descriptions -0..1 + + +titles +0..1 DataSchema->MultiLanguage - - -titles -0..1 - - - -string - - -string - - - -DataSchema->string - - -unit -0..1 + + +descriptions +0..1 diff --git a/visualization/td.svg b/visualization/td.svg index 95b958c76..b0d3a0af3 100644 --- a/visualization/td.svg +++ b/visualization/td.svg @@ -4,11 +4,11 @@ - + %3 - + MultiLanguage @@ -44,31 +44,31 @@ (mandatory) -support - : -string +description + : +string -base - : -anyURI +created + : +dateTime -created - : -dateTime +name + : +string + +(mandatory) -name - : -string - -(mandatory) +support + : +string -description - : -string +base + : +anyURI lastModified @@ -83,7 +83,7 @@ (mandatory) - + Thing->MultiLanguage @@ -103,7 +103,7 @@ boolean - + Thing->PropertyAffordance @@ -125,7 +125,7 @@ (mandatory) - + Thing->VersionInfo @@ -140,21 +140,21 @@ ActionAffordance -idempotent - : -boolean - -(mandatory) +safe + : +boolean + +(mandatory) -safe - : -boolean - -(mandatory) +idempotent + : +boolean + +(mandatory) - + Thing->ActionAffordance @@ -169,22 +169,37 @@ EventAffordance - + Thing->EventAffordance events 0..1 - + +SecurityScheme + + +SecurityScheme + + + +Thing->SecurityScheme + + +securityDefinitions +1..1 + + + Form Form - + Thing->Form @@ -192,34 +207,19 @@ 0..* - + Link - - -Link + + +Link - + Thing->Link - - -links -0..* - - - -SecurityScheme - - -SecurityScheme - - - -Thing->SecurityScheme - - -securityDefinitions -1..1 + + +links +0..* @@ -229,14 +229,14 @@ InteractionAffordance -title - : -string +description + : +string -description - : -string +title + : +string @@ -247,15 +247,15 @@ DataSchema - - -DataSchema + + +DataSchema PropertyAffordance->DataSchema - - + + @@ -266,21 +266,21 @@ ActionAffordance->DataSchema - - -output -0..1 + + +input +0..1 ActionAffordance->DataSchema - - -input -0..1 + + +output +0..1 - + InteractionAffordance->MultiLanguage @@ -288,7 +288,7 @@ 0..1 - + InteractionAffordance->MultiLanguage @@ -296,7 +296,7 @@ 0..1 - + InteractionAffordance->Form @@ -304,12 +304,12 @@ 1..* - + InteractionAffordance->DataSchema - - + + uriVariables -0..1 +0..1 @@ -320,26 +320,26 @@ EventAffordance->DataSchema - - -cancellation -0..1 + + +data +0..1 EventAffordance->DataSchema - - -data -0..1 + + +subscription +0..1 EventAffordance->DataSchema - - -subscription -0..1 + + +cancellation +0..1 diff --git a/visualization/web-linking.svg b/visualization/web-linking.svg index 77854366c..693f984d8 100644 --- a/visualization/web-linking.svg +++ b/visualization/web-linking.svg @@ -4,109 +4,109 @@ - + %3 - + Link - - -Link - - -href - : -anyURI - -(mandatory) - - -rel - : -string - - -type - : -string - - -anchor - : -anyURI + + +Link + + +hintsAtMediaType + : +string + + +hasTarget + : +anyURI + +(mandatory) + + +hasAnchor + : +anyURI + + +hasRelationType + : +string Form - - -Form - - -contentCoding - : -string - - -contentType - : -string - -(mandatory) - - -scopes - : (array of) -string - - -href - : -anyURI - -(mandatory) - - -op - : -string - -(mandatory) - - -subprotocol - : -string - - -security - : (array of) -string + + +Form + + +forContentType + : +string + +(mandatory) + + +security + : (array of) +string + + +forSubProtocol + : +string + + +scopes + : (array of) +string + + +hasTarget + : +anyURI + +(mandatory) + + +forContentCoding + : +string + + +forOperationType + : +string + +(mandatory) ExpectedResponse - - -ExpectedResponse - - -contentType - : -string - -(mandatory) + + +ExpectedResponse + + +forContentType + : +string + +(mandatory) Form->ExpectedResponse - - -response -0..1 + + +returns +0..1 diff --git a/visualization/wot-security.svg b/visualization/wot-security.svg index c201077f2..593f15c8c 100644 --- a/visualization/wot-security.svg +++ b/visualization/wot-security.svg @@ -42,21 +42,21 @@ string -description - : -string +proxy + : +anyURI -scheme - : -string - -(mandatory) +description + : +string -proxy - : -anyURI +scheme + : +string + +(mandatory) @@ -72,26 +72,26 @@ OAuth2SecurityScheme -refresh - : -anyURI +token + : +anyURI -token - : -anyURI +scopes + : (array of) +string -flow - : -string - -(mandatory) +refresh + : +anyURI -scopes - : (array of) -string +flow + : +string + +(mandatory) authorization @@ -127,35 +127,35 @@ BearerSecurityScheme -authorization - : -anyURI +in + : +string + +(mandatory) -name - : -string +format + : +string + +(mandatory) -alg - : -string - -(mandatory) +name + : +string -in - : -string - -(mandatory) +authorization + : +anyURI -format - : -string - -(mandatory) +alg + : +string + +(mandatory) @@ -196,35 +196,35 @@ PoPSecurityScheme -authorization - : -anyURI +in + : +string + +(mandatory) -format - : -string - -(mandatory) +alg + : +string + +(mandatory) -name - : -string +format + : +string + +(mandatory) -in - : -string - -(mandatory) +name + : +string -alg - : -string - -(mandatory) +authorization + : +anyURI @@ -258,18 +258,18 @@ DigestSecurityScheme -qop - : -string - -(mandatory) +in + : +string + +(mandatory) -in - : -string - -(mandatory) +qop + : +string + +(mandatory) name