diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 489187b2..42c3d148 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -9,7 +9,7 @@ "version": "1.4.0", "license": "EPL-2.0 OR W3C-20150513", "dependencies": { - "@node-wot/td-tools": "~0.8.5", + "@thingweb/thing-model": "^1.0.1", "ajv": "^8.11.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", @@ -1212,36 +1212,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@node-wot/td-tools": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/@node-wot/td-tools/-/td-tools-0.8.5.tgz", - "integrity": "sha512-CFAg0+PlmV8pfPH1nvbM3d2AfR5RSVHEe5CglyuAHyxZgWrbSfDZnofakwy7PQL0gNU2DFbEV9ethC6axpl2QA==", - "dependencies": { - "ajv": "^7.0.4", - "debug": "^4.3.4", - "is-absolute-url": "3.0.3", - "json-placeholder-replacer": "^1.0.35", - "url-toolkit": "2.1.6", - "wot-thing-description-types": "^1.1.0-13-October-2022", - "wot-thing-model-types": "^1.1.0-13-October-2022", - "wot-typescript-definitions": "0.8.0-SNAPSHOT.23" - } - }, - "node_modules/@node-wot/td-tools/node_modules/ajv": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", - "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/@sinclair/typebox": { "version": "0.24.28", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz", @@ -1266,6 +1236,58 @@ "@sinonjs/commons": "^1.7.0" } }, + "node_modules/@thingweb/thing-model": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@thingweb/thing-model/-/thing-model-1.0.1.tgz", + "integrity": "sha512-VGk1/L4Vrn+PlZJOhOJBJlPrHYOm6RrkPtEAoYZOuSzXIt4iIq2HyKKFbl7TYp4RAbkM0as7Q6hnPtlTKk0Ztw==", + "dependencies": { + "ajv": "^8.11.0", + "ajv-formats": "^3.0.1", + "debug": "^4.3.4", + "json-placeholder-replacer": "^2.0.4", + "wot-thing-description-types": "1.1.0-09-November-2023", + "wot-thing-model-types": "^1.1.0-09-November-2023", + "wot-typescript-definitions": "0.8.0-SNAPSHOT.29" + } + }, + "node_modules/@thingweb/thing-model/node_modules/ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/@thingweb/thing-model/node_modules/json-placeholder-replacer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/json-placeholder-replacer/-/json-placeholder-replacer-2.0.5.tgz", + "integrity": "sha512-pK/MgeylpZ1VAMO7s/tp5H6VVsbCIc9i+3cUILYnLTw2MT7xqKLowBQGQmFTtcz/O1414oK+f9C8jT79IADdag==", + "bin": { + "jpr": "dist/index.js", + "json-placeholder-replacer": "dist/index.js" + } + }, + "node_modules/@thingweb/thing-model/node_modules/wot-thing-description-types": { + "version": "1.1.0-09-November-2023", + "resolved": "https://registry.npmjs.org/wot-thing-description-types/-/wot-thing-description-types-1.1.0-09-November-2023.tgz", + "integrity": "sha512-qgZ1Khg/L3SkIRSm4POVoj0P5MU4GIwxWdyQz2ckZzhnXesgPqe+AUzGxK37ArlxvaMytyjo0Cx2yfKoDHtlkA==" + }, + "node_modules/@thingweb/thing-model/node_modules/wot-typescript-definitions": { + "version": "0.8.0-SNAPSHOT.29", + "resolved": "https://registry.npmjs.org/wot-typescript-definitions/-/wot-typescript-definitions-0.8.0-SNAPSHOT.29.tgz", + "integrity": "sha512-V5r/JSbFs/eaWgQavEEvaldjYoMuucJ9Ae0BDfUbSm6d9rJJYLEwfrwFKxBCD25Kdroea+kNlQMrYKk783OREQ==", + "dependencies": { + "wot-thing-description-types": "1.1.0-09-November-2023" + } + }, "node_modules/@types/babel__core": { "version": "7.1.19", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz", @@ -3304,14 +3326,6 @@ "node": ">= 0.4" } }, - "node_modules/is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", - "engines": { - "node": ">=8" - } - }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -4298,15 +4312,6 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, - "node_modules/json-placeholder-replacer": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/json-placeholder-replacer/-/json-placeholder-replacer-1.0.35.tgz", - "integrity": "sha512-edlSWqcFVUpKPshaIcJfXpQ8eu0//gk8iU6XHWkCZIp5QEp4hoCFR7uk+LrIzhLTSqmBQ9VBs+EYK8pvWGEpRg==", - "bin": { - "jpr": "dist/index.js", - "json-placeholder-replacer": "dist/index.js" - } - }, "node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -6087,11 +6092,6 @@ "querystring": "0.2.0" } }, - "node_modules/url-toolkit": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.1.6.tgz", - "integrity": "sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw==" - }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", @@ -6240,21 +6240,11 @@ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" }, - "node_modules/wot-thing-description-types": { - "version": "1.1.0-13-October-2022", - "resolved": "https://registry.npmjs.org/wot-thing-description-types/-/wot-thing-description-types-1.1.0-13-October-2022.tgz", - "integrity": "sha512-16LVRNat1cSTiGHZBGKomIwISboAtS3LoZPtYF14uOTvW8wBu/QtJYcZi6MPEXCut7/WNw68EmtYMLfhU5UQbA==" - }, "node_modules/wot-thing-model-types": { "version": "1.1.0-13-October-2022", "resolved": "https://registry.npmjs.org/wot-thing-model-types/-/wot-thing-model-types-1.1.0-13-October-2022.tgz", "integrity": "sha512-gN6Eky3AcrZAFqIUQlyEHhkM+UpkEjFXjUul13mX2FOuKI3uY8Gc6/391RDN0NU93odIq+B7+57CGwQTWKAF1Q==" }, - "node_modules/wot-typescript-definitions": { - "version": "0.8.0-SNAPSHOT.23", - "resolved": "https://registry.npmjs.org/wot-typescript-definitions/-/wot-typescript-definitions-0.8.0-SNAPSHOT.23.tgz", - "integrity": "sha512-xVp0RmiMWfGgW9im/b21Xi6CRn27U99Y3Al2/RpMQB08KGzedmTZlBWL8cex7uKe9Dg/NiD32fUJPZB9GLKAqw==" - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -7266,34 +7256,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "@node-wot/td-tools": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/@node-wot/td-tools/-/td-tools-0.8.5.tgz", - "integrity": "sha512-CFAg0+PlmV8pfPH1nvbM3d2AfR5RSVHEe5CglyuAHyxZgWrbSfDZnofakwy7PQL0gNU2DFbEV9ethC6axpl2QA==", - "requires": { - "ajv": "^7.0.4", - "debug": "^4.3.4", - "is-absolute-url": "3.0.3", - "json-placeholder-replacer": "^1.0.35", - "url-toolkit": "2.1.6", - "wot-thing-description-types": "^1.1.0-13-October-2022", - "wot-thing-model-types": "^1.1.0-13-October-2022", - "wot-typescript-definitions": "0.8.0-SNAPSHOT.23" - }, - "dependencies": { - "ajv": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", - "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - } - } - }, "@sinclair/typebox": { "version": "0.24.28", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz", @@ -7318,6 +7280,48 @@ "@sinonjs/commons": "^1.7.0" } }, + "@thingweb/thing-model": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@thingweb/thing-model/-/thing-model-1.0.1.tgz", + "integrity": "sha512-VGk1/L4Vrn+PlZJOhOJBJlPrHYOm6RrkPtEAoYZOuSzXIt4iIq2HyKKFbl7TYp4RAbkM0as7Q6hnPtlTKk0Ztw==", + "requires": { + "ajv": "^8.11.0", + "ajv-formats": "^3.0.1", + "debug": "^4.3.4", + "json-placeholder-replacer": "^2.0.4", + "wot-thing-description-types": "1.1.0-09-November-2023", + "wot-thing-model-types": "^1.1.0-09-November-2023", + "wot-typescript-definitions": "0.8.0-SNAPSHOT.29" + }, + "dependencies": { + "ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "requires": { + "ajv": "^8.0.0" + } + }, + "json-placeholder-replacer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/json-placeholder-replacer/-/json-placeholder-replacer-2.0.5.tgz", + "integrity": "sha512-pK/MgeylpZ1VAMO7s/tp5H6VVsbCIc9i+3cUILYnLTw2MT7xqKLowBQGQmFTtcz/O1414oK+f9C8jT79IADdag==" + }, + "wot-thing-description-types": { + "version": "1.1.0-09-November-2023", + "resolved": "https://registry.npmjs.org/wot-thing-description-types/-/wot-thing-description-types-1.1.0-09-November-2023.tgz", + "integrity": "sha512-qgZ1Khg/L3SkIRSm4POVoj0P5MU4GIwxWdyQz2ckZzhnXesgPqe+AUzGxK37ArlxvaMytyjo0Cx2yfKoDHtlkA==" + }, + "wot-typescript-definitions": { + "version": "0.8.0-SNAPSHOT.29", + "resolved": "https://registry.npmjs.org/wot-typescript-definitions/-/wot-typescript-definitions-0.8.0-SNAPSHOT.29.tgz", + "integrity": "sha512-V5r/JSbFs/eaWgQavEEvaldjYoMuucJ9Ae0BDfUbSm6d9rJJYLEwfrwFKxBCD25Kdroea+kNlQMrYKk783OREQ==", + "requires": { + "wot-thing-description-types": "1.1.0-09-November-2023" + } + } + } + }, "@types/babel__core": { "version": "7.1.19", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz", @@ -8967,11 +8971,6 @@ "side-channel": "^1.0.4" } }, - "is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==" - }, "is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -9701,11 +9700,6 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, - "json-placeholder-replacer": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/json-placeholder-replacer/-/json-placeholder-replacer-1.0.35.tgz", - "integrity": "sha512-edlSWqcFVUpKPshaIcJfXpQ8eu0//gk8iU6XHWkCZIp5QEp4hoCFR7uk+LrIzhLTSqmBQ9VBs+EYK8pvWGEpRg==" - }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -11084,11 +11078,6 @@ } } }, - "url-toolkit": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.1.6.tgz", - "integrity": "sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw==" - }, "util": { "version": "0.12.4", "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", @@ -11212,21 +11201,11 @@ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" }, - "wot-thing-description-types": { - "version": "1.1.0-13-October-2022", - "resolved": "https://registry.npmjs.org/wot-thing-description-types/-/wot-thing-description-types-1.1.0-13-October-2022.tgz", - "integrity": "sha512-16LVRNat1cSTiGHZBGKomIwISboAtS3LoZPtYF14uOTvW8wBu/QtJYcZi6MPEXCut7/WNw68EmtYMLfhU5UQbA==" - }, "wot-thing-model-types": { "version": "1.1.0-13-October-2022", "resolved": "https://registry.npmjs.org/wot-thing-model-types/-/wot-thing-model-types-1.1.0-13-October-2022.tgz", "integrity": "sha512-gN6Eky3AcrZAFqIUQlyEHhkM+UpkEjFXjUul13mX2FOuKI3uY8Gc6/391RDN0NU93odIq+B7+57CGwQTWKAF1Q==" }, - "wot-typescript-definitions": { - "version": "0.8.0-SNAPSHOT.23", - "resolved": "https://registry.npmjs.org/wot-typescript-definitions/-/wot-typescript-definitions-0.8.0-SNAPSHOT.23.tgz", - "integrity": "sha512-xVp0RmiMWfGgW9im/b21Xi6CRn27U99Y3Al2/RpMQB08KGzedmTZlBWL8cex7uKe9Dg/NiD32fUJPZB9GLKAqw==" - }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/packages/core/package.json b/packages/core/package.json index 56817996..ebd6baf6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,7 +20,7 @@ "prepare": "npm run bundle" }, "dependencies": { - "@node-wot/td-tools": "~0.8.5", + "@thingweb/thing-model": "^1.0.1", "ajv": "^8.11.0", "ajv-formats": "^2.1.1", "ajv-formats-draft2019": "^1.6.1", diff --git a/packages/core/shared.js b/packages/core/shared.js index b2f46042..4539486b 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -1060,7 +1060,7 @@ async function fetchLinkedTm(td) { // But it can relate to other tms as well // Recursively resolve all other tms using node-wot td-tools - const ThingModelHelpers = new (require("@node-wot/td-tools").ThingModelHelpers)(); + const ThingModelHelpers = new (require("@thingweb/thing-model").ThingModelHelpers)(); // The tm resolver expects values for placeholders // However, we don't know (and don't need) them at this moment