Merge pull request #587 from hasanheroglu/586-deleting-tools

586 deleting tools
eclipse-thingweb · Jul 5, 2024 · a77021b · a77021b
2 parents 13ecc47 + 1bf1bb4
commit a77021b
Show file tree

Hide file tree

Showing 68 changed files with 2,673 additions and 36,568 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -2,6 +2,4 @@ package-lock.json
 **/dist
 coverage
 .nyc_output
-**/out
-packages/td_to_openapi/examples/openapi.yaml
-packages/td_to_asyncapi/examples/asyncapi.yaml
+**/out
diff --git a/README.md b/README.md
@@ -46,9 +46,7 @@ Reusable packages:
     It uses the official JSON Schema plus additional scripts for aspects that cannot be checked with a JSON Schema alone. It generates a JSON report of the validation results. [NPM](https://www.npmjs.com/package/@thing-description-playground/core).
 -   [assertions](./packages/assertions/): The assertions package allows to check whether all of the features of the TD standard are present in a single TD or a group of TDs representing an implementation. It needs to be used together with the core package since some features are detected by the core package. [NPM](https://www.npmjs.com/package/@thing-description-playground/assertions).
 -   [defaults](./packages/defaults/): The defaults package can be used to add or remove explicitly stated default values in a TD. It has no dependency to other playground packages. [NPM](https://www.npmjs.com/package/@thing-description-playground/defaults).
--   [td_to_openAPI](./packages/td_to_openAPI): The Open API package allows to create an Open API instance from a Thing Description which has HTTP in the forms. It has no dependency to other playground packages.[NPM](https://www.npmjs.com/package/@thing-description-playground/td_to_openapi).
 -   [td_to_asyncAPI](./packages/td_to_openAPI): The Async API package allows to create an Async API instance from a Thing Description which has MQTT in the forms. It only depends on the defaults package to add defaults to a TD before generating the Async API instance. [NPM](https://www.npmjs.com/package/@thing-description-playground/td_to_asyncapi).
--   [json-spell-checker](./packages/json-spell-checker): The JSON Spell Checker package allows to find spelling mistakes (e.g. action instead of actions) in a JSON document according to its JSON Schema. Such JSON documents could be TDs, Open API specs etc. [NPM](https://www.npmjs.com/package/@thing-description-playground/json-spell-checker).
 
 End Product Packages:
 

diff --git a/packages/cli/index.js b/packages/cli/index.js
@@ -30,8 +30,8 @@ const assertMergeResults = require("@thing-description-playground/assertions").m
 const assertCheckCoverage = require("@thing-description-playground/assertions").checkCoverage;
 const assertResultsToCsv = require("@thing-description-playground/assertions").resultsToCsv;
 const { addDefaults, removeDefaults } = require("@thing-description-playground/defaults");
-const tdToOAP = require("@thing-description-playground/td_to_openapi");
-const tdToAAP = require("@thing-description-playground/td_to_asyncapi");
+const tdToOAP = require("@thingweb/open-api-converter");
+const tdToAAP = require("@thingweb/async-api-converter");
 const commander = require("commander");
 const EventEmitter = require("events");
 const cliProgress = require("cli-progress");

diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -22,8 +22,8 @@
         "@thing-description-playground/assertions": "^1.5.0",
         "@thing-description-playground/core": "^1.4.0",
         "@thing-description-playground/defaults": "^1.4.0",
-        "@thing-description-playground/td_to_asyncapi": "^1.1.1",
-        "@thing-description-playground/td_to_openapi": "^1.3.1",
+        "@thingweb/async-api-converter": "^1.0.0",
+        "@thingweb/open-api-converter": "^1.0.0",
         "cli-progress": "^3.11.2",
         "commander": "^9.4.0",
         "junit-report-builder": "^3.0.1"

diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git 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
@@ -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

diff --git a/packages/json-spell-checker/.editorconfig b/packages/json-spell-checker/.editorconfig
diff --git a/packages/json-spell-checker/README.md b/packages/json-spell-checker/README.md