Update ts types 2022 08 10

package.json

@@ -49,7 +49,7 @@
         "@types/mocha": "^9.0.0",
         "@types/node": "16.4.13",
         "@types/readable-stream": "^2.3.13",
-        "@types/sinon": "^10.0.2",
+        "@types/sinon": "10.0.2",
         "@typescript-eslint/eslint-plugin": "^4.30.0",
         "@typescript-eslint/parser": "^4.30.0",
         "c8": "^7.11.0",
@@ -69,7 +69,7 @@
         "mocha": "^9.1.1",
         "prettier": "^2.3.2",
         "pretty-quick": "^3.1.1",
-        "sinon": "^11.1.1",
+        "sinon": "11.1.1",
         "source-map-support": "^0.5.20",
         "ts-loader": "8",
         "ts-node": "10.1.0",

packages/binding-firestore/package.json

@@ -32,14 +32,14 @@
         "@testdeck/mocha": "^0.1.2",
         "@types/chai": "^4.2.18",
         "@types/chai-as-promised": "^7.1.4",
-        "@types/sinon": "^10.0.2",
+        "@types/sinon": "10.0.2",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
         "firebase-admin": "^9.9.0",
         "firebase-tools": "^9.17.0",
         "kill-port": "^1.6.1",
         "mocha": "^9.1.1",
-        "sinon": "^11.1.1",
+        "sinon": "11.1.1",
         "ts-node": "10.1.0",
         "typescript": "4.4.3",
         "typescript-standard": "^0.3.36",

packages/binding-http/package.json

@@ -63,7 +63,7 @@
         "query-string": "^7.1.1",
         "rxjs": "5.5.11",
         "slugify": "^1.4.5",
-        "wot-thing-description-types": "^1.1.0-20-July-2022"
+        "wot-thing-description-types": "^1.1.0-10-August-2022"
     },
     "scripts": {
         "build": "tsc -b",

packages/binding-mqtt/package.json

@@ -40,7 +40,7 @@
         "aedes": "^0.46.2",
         "mqtt": "^4.2.8",
         "rxjs": "5.5.11",
-        "wot-thing-description-types": "^1.1.0-20-July-2022"
+        "wot-thing-description-types": "^1.1.0-10-August-2022"
     },
     "scripts": {
         "build": "tsc -b",

packages/cli/package.json

@@ -33,7 +33,7 @@
         "ts-node": "10.1.0",
         "typescript": "4.4.3",
         "typescript-standard": "^0.3.36",
-        "wot-thing-description-types": "^1.1.0-20-July-2022",
+        "wot-thing-description-types": "^1.1.0-10-August-2022",
         "wot-typescript-definitions": "0.8.0-SNAPSHOT.23"
     },
     "optionalDependencies": {

packages/core/package.json

@@ -40,7 +40,7 @@
         "ts-node": "10.1.0",
         "typescript": "4.4.3",
         "typescript-standard": "^0.3.36",
-        "wot-thing-description-types": "^1.1.0-20-July-2022",
+        "wot-thing-description-types": "^1.1.0-10-August-2022",
         "wot-typescript-definitions": "^0.8.0-SNAPSHOT.23"
     },
     "dependencies": {

packages/examples/package.json

@@ -23,7 +23,7 @@
         "ts-node": "10.1.0",
         "typescript": "4.4.3",
         "typescript-standard": "^0.3.36",
-        "wot-thing-description-types": "^1.1.0-20-July-2022",
+        "wot-thing-description-types": "^1.1.0-10-August-2022",
         "wot-typescript-definitions": "0.8.0-SNAPSHOT.23"
     },
     "dependencies": {

packages/td-tools/package.json

@@ -45,8 +45,8 @@
         "is-absolute-url": "3.0.3",
         "json-placeholder-replacer": "^1.0.35",
         "url-toolkit": "2.1.6",
-        "wot-thing-description-types": "^1.1.0-20-July-2022",
-        "wot-thing-model-types": "^1.1.0-27-July-2022",
+        "wot-thing-description-types": "^1.1.0-10-August-2022",
+        "wot-thing-model-types": "^1.1.0-10-August-2022",
         "wot-typescript-definitions": "0.8.0-SNAPSHOT.23"
     },
     "scripts": {

packages/td-tools/src/thing-model-helpers.ts

@@ -136,10 +136,17 @@ export class ThingModelHelpers {
      * @experimental
      */
     public static getModelVersion(data: ThingModel): string | undefined {
-        if (!("version" in data) || !(data.version && "model" in data.version)) {
+        if (
+            "version" in data &&
+            data.version &&
+            typeof data.version === "object" &&
+            "model" in data.version &&
+            typeof data.version.model === "string"
+        ) {
+            return data.version.model;
+        } else {
             return undefined;
         }
-        return data.version.model as string;
     }
 
     /**

packages/td-tools/test/ThingModelHelperTest.ts

@@ -26,7 +26,7 @@ class ThingModelHelperTest {
 
     @test "should correctly validate tm schema with ThingModel in @type"() {
         const model = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             title: "thingTest",
             "@type": "tm:ThingModel",
             properties: {
@@ -46,7 +46,7 @@ class ThingModelHelperTest {
     @test "should correctly return the right links"() {
         const thing = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "tm:ThingModel",
             links: [
                 {
@@ -72,7 +72,7 @@ class ThingModelHelperTest {
     @test "should correctly validate tm schema with ThingModel in @type array "() {
         const model = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
             properties: {
                 myProp: {
@@ -91,7 +91,7 @@ class ThingModelHelperTest {
     @test "should reject schema on validation because missing ThingModel definition"() {
         const model = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "random:Type",
             links: [
                 {
@@ -115,7 +115,7 @@ class ThingModelHelperTest {
     @test "should correctly return the model version"() {
         let thing: ThingModel = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
             version: { model: "0.0.1" }, // TODO: check is version is valid
         };
@@ -126,7 +126,7 @@ class ThingModelHelperTest {
 
         thing = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
             version: {},
         };
@@ -136,7 +136,7 @@ class ThingModelHelperTest {
 
         thing = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
         };
 
@@ -162,7 +162,7 @@ class ThingModelHelperTest {
         const model = JSON.parse(modelJSON.toString()) as ThingModel;
         const finalModel = {
             "@type": "tm:ThingModel",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             title: "Smart Lamp Control with Dimming",
             links: [
                 {
@@ -187,7 +187,7 @@ class ThingModelHelperTest {
             extends: [
                 {
                     "@type": "tm:ThingModel",
-                    "@context": ["http://www.w3.org/ns/td"],
+                    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
                     actions: {
                         toggle: { type: "boolean" },
                     },
@@ -216,7 +216,7 @@ class ThingModelHelperTest {
         const thingModel: ThingModel = {
             title: "thingTest",
             "@type": ["random:Type", "tm:ThingModel"],
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             properties: {
                 timestamp1: {
                     "tm:ref": "file://./test/thing-model/tmodels/OnOff.jsonld#/properties/timestamp",
@@ -228,7 +228,7 @@ class ThingModelHelperTest {
         const finalThingModel = {
             title: "thingTest",
             "@type": ["random:Type", "tm:ThingModel"],
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             properties: {
                 timestamp1: {
                     type: "number",
@@ -254,7 +254,7 @@ class ThingModelHelperTest {
     @test async "should correctly import an action and add a field to the action"() {
         const thingModel: ThingModel = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
             actions: {
                 toggle1: {
@@ -274,7 +274,7 @@ class ThingModelHelperTest {
 
         const finalThingModel = {
             title: "thingTest",
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": ["random:Type", "tm:ThingModel"],
             actions: {
                 toggle1: {
@@ -297,7 +297,7 @@ class ThingModelHelperTest {
 
     @test async "should correctly fill placeholders"() {
         const thing = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "tm:ThingModel",
             title: "Thermostate No. {{THERMOSTATE_NUMBER}}",
             base: "mqtt://{{MQTT_BROKER_ADDRESS}}",
@@ -318,7 +318,7 @@ class ThingModelHelperTest {
             THERMOSTATE_TEMPERATURE_OBSERVABLE: true,
         };
         const finalJSON = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "Thing",
             title: "Thermostate No. 4",
             base: "mqtt://192.168.178.72:1883",
@@ -349,7 +349,7 @@ class ThingModelHelperTest {
 
     @test async "should correctly fill placeholders with composed types"() {
         const thing = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "tm:ThingModel",
             arrayField: "{{ARRAY}}",
             title: "Thermostate No. 4",
@@ -360,7 +360,7 @@ class ThingModelHelperTest {
             VERSION_INFO: { instance: "xyz", model: "ABC" },
         };
         const finalJSON = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "Thing",
             title: "Thermostate No. 4",
             arrayField: ["random", "random1", "random2"],
@@ -383,7 +383,7 @@ class ThingModelHelperTest {
 
     @test async "should correctly fill placeholders with composed types in strings"() {
         const thing = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "tm:ThingModel",
             data: "data: {{ARRAY}}",
             title: "Thermostate No. 4",
@@ -394,7 +394,7 @@ class ThingModelHelperTest {
             VERSION_INFO: { instance: "xyz", model: "ABC" },
         };
         const finalJSON = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "Thing",
             title: "Thermostate No. 4",
             data: "data: [1,2,3]",
@@ -417,7 +417,7 @@ class ThingModelHelperTest {
 
     @test async "should reject fill placeholders because of missing fields in map"() {
         const thing = {
-            "@context": ["http://www.w3.org/ns/td"],
+            "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
             "@type": "tm:ThingModel",
             title: "Thermostate No. {{THERMOSTATE_NUMBER}}",
             base: "mqtt://{{MQTT_BROKER_ADDRESS}}",

packages/td-tools/test/thing-model/tmodels/BasicOnOffTM.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Basic On/Off Thing Model",
     "links": [],

packages/td-tools/test/thing-model/tmodels/Led.composed.tm.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "title": "Led Thing Model",
     "@type": "tm:ThingModel",
     "links": [
@@ -44,4 +44,4 @@
             }
         }
     }
-}
+}

packages/td-tools/test/thing-model/tmodels/Led.tm.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Led Thing Model",
     "version": {
@@ -35,4 +35,4 @@
             }
         }
     }
-}
+}

packages/td-tools/test/thing-model/tmodels/LedExtend.composed.tm.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "title": "Led Thing Model Extend",
     "@type": "tm:ThingModel",
     "links": [
@@ -56,4 +56,4 @@
             "type": "boolean"
         }
     }
-}
+}

packages/td-tools/test/thing-model/tmodels/LedExtend.tm.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Led Thing Model Extend",
     "version": {
@@ -42,4 +42,4 @@
             }
         }
     }
-}
+}

packages/td-tools/test/thing-model/tmodels/LedExtendLoop.tm.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Led Thing Model Extend",
     "version": {
@@ -42,4 +42,4 @@
             }
         }
     }
-}
+}

packages/td-tools/test/thing-model/tmodels/OnOff.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Basic On/Off Thing Model",
     "properties": {

packages/td-tools/test/thing-model/tmodels/SmartLampControlExtend.jsonld

@@ -1,6 +1,6 @@
 {
     "@type": "tm:ThingModel",
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "title": "Smart Lamp Control with Dimming",
     "links": [
         {

packages/td-tools/test/thing-model/tmodels/SmartLampControlExtended.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type": "tm:ThingModel",
     "title": "Smart Lamp Control with Dimming",
     "links": [

packages/td-tools/test/thing-model/tmodels/SmartLampControlImport.jsonld

@@ -1,5 +1,5 @@
 {
-    "@context": ["http://www.w3.org/ns/td"],
+    "@context": ["https://www.w3.org/2022/wot/td/v1.1"],
     "@type" : "tm:ThingModel",
     "title": "Smart Lamp Control",
     "properties" : {