diff --git a/package-lock.json b/package-lock.json index 9f5f2e7bf3..939abc0a7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,8 @@ "@commitlint/config-conventional": "^19.8.0", "husky": "^9.1.7", "lerna": "^7.1.4", - "nx": "18.3.4" + "nx": "18.3.4", + "shiki": "^3.15.0" }, "optionalDependencies": { "@nx/nx-linux-x64-gnu": "18.3.4" @@ -2320,6 +2321,38 @@ "lit": "^2.2.7" } }, + "node_modules/@compas-oscd/open-scd": { + "version": "0.34.42", + "license": "Apache-2.0", + "dependencies": { + "@compas-oscd/core": "^0.1.21", + "@compas-oscd/xml": "^0.0.1", + "@material/mwc-dialog": "0.22.1", + "@material/mwc-drawer": "0.22.1", + "@material/mwc-fab": "0.22.1", + "@material/mwc-formfield": "0.22.1", + "@material/mwc-icon": "0.22.1", + "@material/mwc-icon-button": "0.22.1", + "@material/mwc-icon-button-toggle": "0.22.1", + "@material/mwc-linear-progress": "0.22.1", + "@material/mwc-list": "0.22.1", + "@material/mwc-menu": "0.22.1", + "@material/mwc-select": "0.22.1", + "@material/mwc-snackbar": "0.22.1", + "@material/mwc-switch": "0.22.1", + "@material/mwc-tab": "0.22.1", + "@material/mwc-tab-bar": "0.22.1", + "@material/mwc-textarea": "0.22.1", + "@material/mwc-textfield": "0.22.1", + "@material/mwc-top-app-bar-fixed": "0.22.1", + "@openscd/oscd-api": "^0.1.5", + "ace-custom-element": "^1.6.5", + "lit": "^2.2.7", + "lit-translate": "^1.2.1", + "marked": "^4.0.10", + "panzoom": "^9.4.2" + } + }, "node_modules/@compas-oscd/xml": { "version": "0.0.1", "license": "Apache-2.0" @@ -3120,25 +3153,25 @@ "node": ">=10" } }, - "node_modules/@lerna/create/node_modules/@nx/nx-linux-x64-gnu": { + "node_modules/@lerna/create/node_modules/@nx/nx-darwin-arm64": { "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", - "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", "cpu": [ - "x64" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "linux" + "darwin" ], "engines": { "node": ">= 10" } }, - "node_modules/@lerna/create/node_modules/@nx/nx-win32-x64-msvc": { + "node_modules/@lerna/create/node_modules/@nx/nx-linux-x64-gnu": { "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", + "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", "cpu": [ "x64" ], @@ -3146,7 +3179,7 @@ "license": "MIT", "optional": true, "os": [ - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -6587,8 +6620,6 @@ }, "node_modules/@nrwl/devkit/node_modules/@nx/nx-darwin-arm64": { "version": "17.3.2", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.3.2.tgz", - "integrity": "sha512-hn12o/tt26Pf4wG+8rIBgNIEZq5BFlHLv3scNrgKbd5SancHlTbY4RveRGct737UQ/78GCMCgMDRgNdagbCr6w==", "cpu": [ "arm64" ], @@ -6749,6 +6780,8 @@ }, "node_modules/@nrwl/devkit/node_modules/@nx/nx-win32-x64-msvc": { "version": "17.3.2", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.3.2.tgz", + "integrity": "sha512-4hQm+7coy+hBqGY9J709hz/tUPijhf/WS7eML2r2xBmqBew3PMHfeZuaAAYWN690nIsu0WX3wyDsNjulR8HGPQ==", "cpu": [ "x64" ], @@ -7134,9 +7167,7 @@ } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz", - "integrity": "sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==", + "version": "18.3.4", "cpu": [ "arm64" ], @@ -7286,7 +7317,9 @@ } }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "18.3.4", + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz", + "integrity": "sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==", "cpu": [ "x64" ], @@ -8101,6 +8134,66 @@ "rollup": "^1.20.0||^2.0.0" } }, + "node_modules/@shikijs/core": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.15.0", + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4", + "hast-util-to-html": "^9.0.5" + } + }, + "node_modules/@shikijs/engine-javascript": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.15.0", + "@shikijs/vscode-textmate": "^10.0.2", + "oniguruma-to-es": "^4.3.3" + } + }, + "node_modules/@shikijs/engine-oniguruma": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.15.0", + "@shikijs/vscode-textmate": "^10.0.2" + } + }, + "node_modules/@shikijs/langs": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.15.0" + } + }, + "node_modules/@shikijs/themes": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "3.15.0" + } + }, + "node_modules/@shikijs/types": { + "version": "3.15.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4" + } + }, + "node_modules/@shikijs/vscode-textmate": { + "version": "10.0.2", + "dev": true, + "license": "MIT" + }, "node_modules/@sigstore/bundle": { "version": "1.1.0", "dev": true, @@ -8733,6 +8826,14 @@ "@types/send": "*" } }, + "node_modules/@types/hast": { + "version": "3.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/@types/http-assert": { "version": "1.5.4", "dev": true, @@ -8868,6 +8969,14 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/mdast": { + "version": "4.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.4", "dev": true, @@ -9018,6 +9127,11 @@ "version": "2.0.5", "license": "MIT" }, + "node_modules/@types/unist": { + "version": "3.0.3", + "dev": true, + "license": "MIT" + }, "node_modules/@types/whatwg-url": { "version": "6.4.0", "dev": true, @@ -11560,6 +11674,15 @@ "node": ">= 0.6" } }, + "node_modules/ccount": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/chai": { "version": "4.3.10", "dev": true, @@ -11688,6 +11811,24 @@ "node": ">=8" } }, + "node_modules/character-entities-html4": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/chardet": { "version": "0.7.0", "dev": true, @@ -12112,6 +12253,15 @@ "node": ">= 0.8" } }, + "node_modules/comma-separated-tokens": { + "version": "2.0.3", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/command-line-args": { "version": "5.2.1", "dev": true, @@ -13325,6 +13475,18 @@ "detect-port": "bin/detect-port.js" } }, + "node_modules/devlop": { + "version": "1.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "dequal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/devtools-protocol": { "version": "0.0.981744", "dev": true, @@ -14127,6 +14289,18 @@ "dev": true, "license": "MIT" }, + "node_modules/esinstall/node_modules/fsevents": { + "version": "2.1.3", + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/esinstall/node_modules/rollup": { "version": "2.37.1", "dev": true, @@ -15235,6 +15409,18 @@ "dev": true, "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "dev": true, @@ -15947,6 +16133,40 @@ "node": ">= 0.4" } }, + "node_modules/hast-util-to-html": { + "version": "9.0.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "ccount": "^2.0.0", + "comma-separated-tokens": "^2.0.0", + "hast-util-whitespace": "^3.0.0", + "html-void-elements": "^3.0.0", + "mdast-util-to-hast": "^13.0.0", + "property-information": "^7.0.0", + "space-separated-tokens": "^2.0.0", + "stringify-entities": "^4.0.0", + "zwitch": "^2.0.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-whitespace": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/he": { "version": "1.2.0", "dev": true, @@ -16037,6 +16257,15 @@ "node": ">=0.10.0" } }, + "node_modules/html-void-elements": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/htmlparser2": { "version": "7.2.0", "dev": true, @@ -18243,25 +18472,25 @@ "node": ">=10" } }, - "node_modules/lerna/node_modules/@nx/nx-linux-x64-gnu": { + "node_modules/lerna/node_modules/@nx/nx-darwin-arm64": { "version": "16.10.0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", - "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", "cpu": [ - "x64" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "linux" + "darwin" ], "engines": { "node": ">= 10" } }, - "node_modules/lerna/node_modules/@nx/nx-win32-x64-msvc": { + "node_modules/lerna/node_modules/@nx/nx-linux-x64-gnu": { "version": "16.10.0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz", + "integrity": "sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==", "cpu": [ "x64" ], @@ -18269,7 +18498,7 @@ "license": "MIT", "optional": true, "os": [ - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -21747,6 +21976,26 @@ "dev": true, "license": "Apache-2.0" }, + "node_modules/mdast-util-to-hast": { + "version": "13.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/hast": "^3.0.0", + "@types/mdast": "^4.0.0", + "@ungap/structured-clone": "^1.0.0", + "devlop": "^1.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "trim-lines": "^3.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/media-typer": { "version": "0.3.0", "dev": true, @@ -21811,6 +22060,90 @@ "node": ">=10.4.0" } }, + "node_modules/micromark-util-character": { + "version": "2.1.1", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-encode": { + "version": "2.0.1", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/micromark-util-sanitize-uri": { + "version": "2.0.1", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT", + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-encode": "^2.0.0", + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-symbol": { + "version": "2.0.1", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, + "node_modules/micromark-util-types": { + "version": "2.0.2", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "license": "MIT" + }, "node_modules/micromatch": { "version": "4.0.5", "dev": true, @@ -23014,23 +23347,6 @@ } } }, - "node_modules/nx/node_modules/@nx/nx-darwin-arm64": { - "version": "18.3.4", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-18.3.4.tgz", - "integrity": "sha512-MOGk9z4fIoOkJB68diH3bwoWrC8X9IzMNsz1mu0cbVfgCRAfIV3b+lMsiwQYzWal3UWW5DE5Rkss4F8whiV5Uw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, "node_modules/nx/node_modules/@nx/nx-darwin-x64": { "version": "18.3.4", "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-18.3.4.tgz", @@ -23150,6 +23466,23 @@ "node": ">= 10" } }, + "node_modules/nx/node_modules/@nx/nx-win32-x64-msvc": { + "version": "18.3.4", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-18.3.4.tgz", + "integrity": "sha512-/RqEjNU9hxIBxRLafCNKoH3SaB2FShf+1ZnIYCdAoCZBxLJebDpnhiyrVs0lPnMj9248JbizEMdJj1+bs/bXig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/nx/node_modules/ansi-regex": { "version": "5.0.1", "dev": true, @@ -23554,6 +23887,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/oniguruma-parser": { + "version": "0.12.1", + "dev": true, + "license": "MIT" + }, + "node_modules/oniguruma-to-es": { + "version": "4.3.3", + "dev": true, + "license": "MIT", + "dependencies": { + "oniguruma-parser": "^0.12.1", + "regex": "^6.0.1", + "regex-recursion": "^6.0.2" + } + }, "node_modules/only": { "version": "0.0.2", "dev": true @@ -24490,6 +24838,18 @@ "node": ">=18" } }, + "node_modules/playwright/node_modules/fsevents": { + "version": "2.3.2", + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/please-upgrade-node": { "version": "3.2.0", "dev": true, @@ -24841,6 +25201,15 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/property-information": { + "version": "7.1.0", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/protocols": { "version": "2.0.2", "dev": true, @@ -25448,6 +25817,27 @@ "@babel/runtime": "^7.8.4" } }, + "node_modules/regex": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-recursion": { + "version": "6.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-utilities": { + "version": "2.3.0", + "dev": true, + "license": "MIT" + }, "node_modules/regexp.prototype.flags": { "version": "1.5.1", "dev": true, @@ -26158,13 +26548,18 @@ } }, "node_modules/shiki": { - "version": "0.9.15", + "version": "3.15.0", "dev": true, "license": "MIT", "dependencies": { - "jsonc-parser": "^3.0.0", - "vscode-oniguruma": "^1.6.1", - "vscode-textmate": "5.2.0" + "@shikijs/core": "3.15.0", + "@shikijs/engine-javascript": "3.15.0", + "@shikijs/engine-oniguruma": "3.15.0", + "@shikijs/langs": "3.15.0", + "@shikijs/themes": "3.15.0", + "@shikijs/types": "3.15.0", + "@shikijs/vscode-textmate": "^10.0.2", + "@types/hast": "^3.0.4" } }, "node_modules/side-channel": { @@ -26717,6 +27112,18 @@ "fsevents": "~2.1.2" } }, + "node_modules/snowpack/node_modules/rollup/node_modules/fsevents": { + "version": "2.1.3", + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/snowpack/node_modules/strip-ansi": { "version": "6.0.1", "dev": true, @@ -26808,6 +27215,15 @@ "dev": true, "license": "MIT" }, + "node_modules/space-separated-tokens": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/spawn-command": { "version": "0.0.2-1", "dev": true, @@ -27194,6 +27610,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/stringify-entities": { + "version": "4.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "character-entities-html4": "^2.0.0", + "character-entities-legacy": "^3.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/stringify-object": { "version": "3.3.0", "dev": true, @@ -27483,8 +27912,7 @@ }, "node_modules/taffydb": { "version": "2.6.2", - "dev": true, - "license": "BSD-2-Clause" + "dev": true }, "node_modules/tar": { "version": "6.2.0", @@ -27780,6 +28208,15 @@ "dev": true, "license": "ISC" }, + "node_modules/trim-lines": { + "version": "3.0.1", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/trim-newlines": { "version": "3.0.1", "dev": true, @@ -28372,6 +28809,16 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/typedoc/node_modules/shiki": { + "version": "0.9.15", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonc-parser": "^3.0.0", + "vscode-oniguruma": "^1.6.1", + "vscode-textmate": "5.2.0" + } + }, "node_modules/typescript": { "version": "4.3.5", "dev": true, @@ -28542,6 +28989,69 @@ "node": ">=8" } }, + "node_modules/unist-util-is": { + "version": "6.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-position": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "6.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/universal-user-agent": { "version": "6.0.1", "dev": true, @@ -28862,6 +29372,32 @@ "dev": true, "license": "MIT" }, + "node_modules/vfile": { + "version": "6.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "4.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/vm2": { "version": "3.9.19", "dev": true, @@ -30341,6 +30877,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/zwitch": { + "version": "2.0.4", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "packages/addons": { "name": "@openscd/addons", "version": "0.34.0", @@ -30674,6 +31219,25 @@ "dev": true, "license": "MIT" }, + "packages/addons/node_modules/glob": { + "version": "7.2.3", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "packages/addons/node_modules/has-flag": { "version": "4.0.0", "dev": true, @@ -30721,6 +31285,16 @@ "node": ">=10" } }, + "packages/addons/node_modules/shiki": { + "version": "0.9.15", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonc-parser": "^3.0.0", + "vscode-oniguruma": "^1.6.1", + "vscode-textmate": "5.2.0" + } + }, "packages/addons/node_modules/sinon": { "version": "17.0.1", "dev": true, @@ -30806,6 +31380,7 @@ "license": "Apache-2.0", "dependencies": { "@compas-oscd/core": "^0.1.23", + "@compas-oscd/open-scd": "^0.34.42", "@compas-oscd/xml": "^0.0.1", "@material/mwc-dialog": "0.22.1", "@material/mwc-drawer": "0.22.1", @@ -30826,7 +31401,6 @@ "@material/mwc-textfield": "0.22.1", "@material/mwc-top-app-bar-fixed": "0.22.1", "@openscd/addons": "*", - "@openscd/open-scd": "*", "@openscd/plugins": "*", "ace-custom-element": "^1.6.5", "csv-stringify": "^6.2.0", @@ -34534,6 +35108,11 @@ "node": ">=10.12.0" } }, + "packages/openscd/node_modules/vscode-textmate": { + "version": "8.0.0", + "dev": true, + "license": "MIT" + }, "packages/openscd/node_modules/wrap-ansi": { "version": "7.0.0", "dev": true, @@ -34568,6 +35147,7 @@ "version": "0.0.1", "license": "Apache-2.0", "dependencies": { + "@compas-oscd/open-scd": "^0.34.42", "@material/mwc-dialog": "0.22.1", "@material/mwc-fab": "0.22.1", "@material/mwc-formfield": "0.22.1", @@ -35680,6 +36260,11 @@ "node": ">=10.12.0" } }, + "packages/plugins/node_modules/vscode-textmate": { + "version": "8.0.0", + "dev": true, + "license": "MIT" + }, "packages/plugins/node_modules/wrap-ansi": { "version": "7.0.0", "dev": true, diff --git a/package.json b/package.json index 8556f73874..01e6d6222e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "@commitlint/config-conventional": "^19.8.0", "husky": "^9.1.7", "lerna": "^7.1.4", - "nx": "18.3.4" + "nx": "18.3.4", + "shiki": "^3.15.0" }, "optionalDependencies": { "@nx/nx-linux-x64-gnu": "18.3.4" diff --git a/packages/compas-open-scd/package.json b/packages/compas-open-scd/package.json index c352e3c01a..e1a11af1ad 100644 --- a/packages/compas-open-scd/package.json +++ b/packages/compas-open-scd/package.json @@ -19,6 +19,7 @@ "type": "module", "dependencies": { "@compas-oscd/core": "^0.1.23", + "@compas-oscd/open-scd": "^0.34.42", "@compas-oscd/xml": "^0.0.1", "@material/mwc-dialog": "0.22.1", "@material/mwc-drawer": "0.22.1", @@ -39,7 +40,6 @@ "@material/mwc-textfield": "0.22.1", "@material/mwc-top-app-bar-fixed": "0.22.1", "@openscd/addons": "*", - "@openscd/open-scd": "*", "@openscd/plugins": "*", "ace-custom-element": "^1.6.5", "csv-stringify": "^6.2.0", diff --git a/packages/compas-open-scd/snowpack.config.mjs b/packages/compas-open-scd/snowpack.config.mjs index 1a4e4766f9..4af7413e65 100644 --- a/packages/compas-open-scd/snowpack.config.mjs +++ b/packages/compas-open-scd/snowpack.config.mjs @@ -1,6 +1,6 @@ -export default ({ +export default { plugins: ['@snowpack/plugin-typescript'], - packageOptions : { + packageOptions: { external: [ '@web/dev-server-core', '@web/dev-server-esbuild', @@ -11,33 +11,33 @@ export default ({ ], }, exclude: [ - "**/node_modules/**/*", - ".editorconfig", - ".eslintrc.cjs", - ".travis.yml", - "**/karma.conf.cjs", - "**/Dockerfile", - "**/package*", - "**/tsconfig.json", - "**/workbox-config.cjs", - "**/*.@(spec|test).@(js|mjs)", - "**/__snapshots__/**/*", - "**/coverage/**/*", - "**/out-tsc/**/*", - "**/test/**/*", - ".gitignore", - "**/.git/**", - "**/.github/**", - "**/.idea/**", - "**/web-test-runner.config.mjs", - "**/oscd-plugins/auto-doc/**/*", + '**/node_modules/**/*', + '.editorconfig', + '.eslintrc.cjs', + '.travis.yml', + '**/karma.conf.cjs', + '**/Dockerfile', + '**/package*', + '**/tsconfig.json', + '**/workbox-config.cjs', + '**/*.@(spec|test).@(js|mjs)', + '**/__snapshots__/**/*', + '**/coverage/**/*', + '**/out-tsc/**/*', + '**/test/**/*', + '.gitignore', + '**/.git/**', + '**/.github/**', + '**/.idea/**', + '**/web-test-runner.config.mjs', + '**/oscd-plugins/auto-doc/**/*', ], - workspaceRoot: "../../", + workspaceRoot: '../../', mount: { '../openscd/': '/openscd/', '../plugins/': '/plugins/', '../external-plugins/': '/external-plugins/', - "./": "/", + './': '/', }, alias: { '@openscd/open-scd': '../openscd/', @@ -45,6 +45,5 @@ export default ({ }, buildOptions: { htmlFragments: true, - } -}); - + }, +}; diff --git a/packages/compas-open-scd/src/addons/CompasHistory.ts b/packages/compas-open-scd/src/addons/CompasHistory.ts index 66edb74293..cb25feb92f 100644 --- a/packages/compas-open-scd/src/addons/CompasHistory.ts +++ b/packages/compas-open-scd/src/addons/CompasHistory.ts @@ -9,16 +9,14 @@ import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; import '@material/mwc-snackbar'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd/filtered-list.js'; import { IssueDetail } from '@compas-oscd/core'; -import { - HistoryUIDetail, - OscdHistory, -} from '@openscd/open-scd/src/addons/History.js'; +import { HistoryUIDetail, OscdHistory } from '@compas-oscd/open-scd'; + import { wizards } from '@openscd/plugins/src/wizards/wizard-library'; -import { newWizardEvent, SCLTag } from '@openscd/open-scd/src/foundation'; +import { newWizardEvent, SCLTag } from '@compas-oscd/open-scd'; import { nothing } from 'lit-html'; export enum HistoryUIKind { diff --git a/packages/compas-open-scd/src/addons/CompasLayout.ts b/packages/compas-open-scd/src/addons/CompasLayout.ts index d1d515a0b9..eb02eba0a1 100644 --- a/packages/compas-open-scd/src/addons/CompasLayout.ts +++ b/packages/compas-open-scd/src/addons/CompasLayout.ts @@ -1,15 +1,9 @@ -import { - customElement, - html, - property, - TemplateResult, -} from 'lit-element'; +import { customElement, html, property, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; import type { UserInfoEvent } from '../compas/foundation'; -import { OscdLayout } from '@openscd/open-scd/src/addons/Layout.js'; - +import { OscdLayout } from '@compas-oscd/open-scd'; @customElement('compas-layout') export class CompasLayout extends OscdLayout { @@ -29,16 +23,16 @@ export class CompasLayout extends OscdLayout { protected renderActionItems(): TemplateResult { return html` ${this.username != undefined - ? html`${get('userinfo.loggedInAs', { - name: this.username, - })}` - : ``} - ${this.menu.map(this.renderActionItem)} + ? html`${get('userinfo.loggedInAs', { + name: this.username, + })}` + : ``} + ${this.menu.map(this.renderActionItem)} `; } } diff --git a/packages/compas-open-scd/src/compas-editors/CompasVersions.ts b/packages/compas-open-scd/src/compas-editors/CompasVersions.ts index 32d365026e..cbfb95d1bc 100644 --- a/packages/compas-open-scd/src/compas-editors/CompasVersions.ts +++ b/packages/compas-open-scd/src/compas-editors/CompasVersions.ts @@ -21,12 +21,12 @@ import '@material/mwc-list/mwc-check-list-item'; import { Dialog } from '@material/mwc-dialog'; import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/plain-compare-list.js'; +import '@compas-oscd/open-scd/plain-compare-list.js'; import { newLogEvent } from '@compas-oscd/core'; import { newOpenDocEvent } from '@compas-oscd/core'; -import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; import { CompasSclDataService, diff --git a/packages/compas-open-scd/src/compas-editors/Sitipe.ts b/packages/compas-open-scd/src/compas-editors/Sitipe.ts index 5ca7de08a7..e9d511f5f6 100644 --- a/packages/compas-open-scd/src/compas-editors/Sitipe.ts +++ b/packages/compas-open-scd/src/compas-editors/Sitipe.ts @@ -2,7 +2,7 @@ import { css, html, LitElement, property, TemplateResult } from 'lit-element'; import { translate } from 'lit-translate'; import './sitipe/sitipe-substation.js'; -import { isPublic } from '@openscd/open-scd/src/foundation.js'; +import { isPublic } from '@compas-oscd/open-scd'; /** An editor [[`plugin`]] for Sitipe based configuration */ export default class SitipePlugin extends LitElement { diff --git a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts index 912ed38ed1..51cfdce0d9 100644 --- a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts +++ b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts @@ -17,15 +17,15 @@ import '@material/mwc-icon-button'; import { IconButton } from '@material/mwc-icon-button'; -import { isPublic } from '@openscd/open-scd/src/foundation.js'; +import { isPublic } from '@compas-oscd/open-scd'; import { newActionEvent } from '@compas-oscd/core'; import { createElement } from '@compas-oscd/xml'; import { newLogEvent } from '@compas-oscd/core'; import { ComplexAction, SimpleAction } from '@compas-oscd/core'; -import '@openscd/open-scd/src/action-pane.js'; -import '@openscd/open-scd/src/action-icon.js'; +import '@compas-oscd/open-scd/action-pane.js'; +import '@compas-oscd/open-scd/action-icon.js'; import { SIEMENS_SITIPE_IED_REF, diff --git a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-substation.ts b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-substation.ts index 498bd823af..66540f2317 100644 --- a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-substation.ts +++ b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-substation.ts @@ -13,8 +13,8 @@ import '@material/mwc-list'; import '@material/mwc-icon'; import '@material/mwc-icon-button'; -import '@openscd/open-scd/src/action-pane.js'; -import '@openscd/open-scd/src/action-icon.js'; +import '@compas-oscd/open-scd/action-pane.js'; +import '@compas-oscd/open-scd/action-icon.js'; import './sitipe-bay.js'; diff --git a/packages/compas-open-scd/src/compas-wizards/scl.ts b/packages/compas-open-scd/src/compas-wizards/scl.ts index 3ee7223164..4d6669764a 100644 --- a/packages/compas-open-scd/src/compas-wizards/scl.ts +++ b/packages/compas-open-scd/src/compas-wizards/scl.ts @@ -6,7 +6,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@compas-oscd/xml'; diff --git a/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts b/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts index 1b8a5db2c9..00c491d539 100644 --- a/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts +++ b/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts @@ -11,7 +11,7 @@ import { get, translate } from 'lit-translate'; import '@material/mwc-list'; import '@material/mwc-list/mwc-check-list-item'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { newLogEvent } from '@compas-oscd/core'; import { newOpenDocEvent } from '@compas-oscd/core'; diff --git a/packages/compas-open-scd/src/compas/CompasComment.ts b/packages/compas-open-scd/src/compas/CompasComment.ts index f2512c9bcb..2b6cd47e91 100644 --- a/packages/compas-open-scd/src/compas/CompasComment.ts +++ b/packages/compas-open-scd/src/compas/CompasComment.ts @@ -5,10 +5,10 @@ import { LitElement, TemplateResult, } from 'lit-element'; -import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js"; +import { WizardTextField } from '@compas-oscd/open-scd'; import { translate } from 'lit-translate'; -import "@openscd/open-scd/src/wizard-textfield.js"; +import '@compas-oscd/open-scd/wizard-textfield.js'; @customElement('compas-comment') export class CompasCommentElement extends LitElement { diff --git a/packages/compas-open-scd/src/compas/CompasExistsIn.ts b/packages/compas-open-scd/src/compas/CompasExistsIn.ts index 06581ccff1..46dbd42f61 100644 --- a/packages/compas-open-scd/src/compas/CompasExistsIn.ts +++ b/packages/compas-open-scd/src/compas/CompasExistsIn.ts @@ -1,6 +1,6 @@ import { property, PropertyValues, state } from 'lit-element'; -import { LitElementConstructor, Mixin } from '@openscd/open-scd/src/foundation.js'; +import { LitElementConstructor, Mixin } from '@compas-oscd/open-scd'; import { getTypeFromDocName } from './foundation.js'; import { CompasSclDataService } from '../compas-services/CompasSclDataService.js'; diff --git a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts index 9c4fe02389..88f0af235e 100644 --- a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts +++ b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts @@ -2,11 +2,11 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element'; import '@material/mwc-list/mwc-list-item'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { newOpenDocEvent } from '@compas-oscd/core'; import { newPendingStateEvent } from '@compas-oscd/core'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd/filtered-list.js'; import { createLogEvent, diff --git a/packages/compas-open-scd/src/compas/CompasLabelsField.ts b/packages/compas-open-scd/src/compas/CompasLabelsField.ts index 0ab67ddb6c..b3c91540ec 100644 --- a/packages/compas-open-scd/src/compas/CompasLabelsField.ts +++ b/packages/compas-open-scd/src/compas/CompasLabelsField.ts @@ -15,9 +15,9 @@ import '@material/mwc-list/mwc-list-item'; import '@material/mwc-icon'; import '@material/mwc-icon-button'; -import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js"; +import { WizardTextField } from '@compas-oscd/open-scd'; -import "@openscd/open-scd/src/wizard-textfield.js"; +import '@compas-oscd/open-scd/wizard-textfield.js'; import { COMPAS_LABELS_MAXIMUM, diff --git a/packages/compas-open-scd/src/compas/CompasOpen.ts b/packages/compas-open-scd/src/compas/CompasOpen.ts index bf19be8dec..493604119a 100644 --- a/packages/compas-open-scd/src/compas/CompasOpen.ts +++ b/packages/compas-open-scd/src/compas/CompasOpen.ts @@ -17,7 +17,7 @@ import { createLogEvent } from '../compas-services/foundation.js'; import { SclSelectedEvent } from './CompasSclList.js'; import { TypeSelectedEvent } from './CompasSclTypeList.js'; -import '@openscd/open-scd/src/WizardDivider.js'; +import '@compas-oscd/open-scd/WizardDivider.js'; import './CompasSclTypeList.js'; import './CompasSclList.js'; diff --git a/packages/compas-open-scd/src/compas/CompasSave.ts b/packages/compas-open-scd/src/compas/CompasSave.ts index ed1c15c834..c3bcf76778 100644 --- a/packages/compas-open-scd/src/compas/CompasSave.ts +++ b/packages/compas-open-scd/src/compas/CompasSave.ts @@ -17,7 +17,7 @@ import '@material/mwc-button'; import { newLogEvent } from '@compas-oscd/core'; import { saveDocumentToFile } from '../file.js'; -import '@openscd/open-scd/src/WizardDivider.js'; +import '@compas-oscd/open-scd/WizardDivider.js'; import { CompasExistsIn } from './CompasExistsIn.js'; import { CompasChangeSetRadiogroup } from './CompasChangeSetRadiogroup.js'; diff --git a/packages/compas-open-scd/src/compas/CompasSclList.ts b/packages/compas-open-scd/src/compas/CompasSclList.ts index 56ce6a356e..a470ae8337 100644 --- a/packages/compas-open-scd/src/compas/CompasSclList.ts +++ b/packages/compas-open-scd/src/compas/CompasSclList.ts @@ -14,10 +14,10 @@ import '@material/mwc-icon'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import { SelectedItemsChangedEvent } from '@openscd/open-scd/src/oscd-filter-button.js'; +import { SelectedItemsChangedEvent } from '@compas-oscd/open-scd'; -import '@openscd/open-scd/src/filtered-list.js'; -import '@openscd/open-scd/src/oscd-filter-button.js'; +import '@compas-oscd/open-scd/filtered-list.js'; +import '@compas-oscd/open-scd/oscd-filter-button.js'; import { CompasSclDataService, diff --git a/packages/compas-open-scd/src/compas/CompasSettings.ts b/packages/compas-open-scd/src/compas/CompasSettings.ts index 303906da43..5536814f3b 100644 --- a/packages/compas-open-scd/src/compas/CompasSettings.ts +++ b/packages/compas-open-scd/src/compas/CompasSettings.ts @@ -11,7 +11,7 @@ import { translate } from 'lit-translate'; import '@material/mwc-textfield'; import '@material/mwc-button'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base'; import { Switch } from '@material/mwc-switch'; diff --git a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts index f56e55d03f..e4673d89f1 100644 --- a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts +++ b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts @@ -9,11 +9,11 @@ import { newWizardEvent, Wizard, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { newLogEvent } from '@compas-oscd/core'; import { newPendingStateEvent } from '@compas-oscd/core'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd/wizard-textfield.js'; import { CompasExistsIn } from './CompasExistsIn.js'; import { CompasSclDataService } from '../compas-services/CompasSclDataService.js'; diff --git a/packages/compas-open-scd/src/compas/private.ts b/packages/compas-open-scd/src/compas/private.ts index 3593129746..e315e3cbcc 100644 --- a/packages/compas-open-scd/src/compas/private.ts +++ b/packages/compas-open-scd/src/compas/private.ts @@ -1,4 +1,4 @@ -import { SCL_NAMESPACE } from '@openscd/open-scd/src/schemas.js'; +import { SCL_NAMESPACE } from '@compas-oscd/open-scd'; export const COMPAS_NAMESPACE = 'https://www.lfenergy.org/compas/extension/v1'; export const COMPAS_PREFIX = 'compas'; diff --git a/packages/compas-open-scd/src/locamation/LocamationIEDList.ts b/packages/compas-open-scd/src/locamation/LocamationIEDList.ts index b95298c069..f24ce88f74 100644 --- a/packages/compas-open-scd/src/locamation/LocamationIEDList.ts +++ b/packages/compas-open-scd/src/locamation/LocamationIEDList.ts @@ -1,27 +1,53 @@ -import {css, customElement, html, LitElement, property, TemplateResult} from 'lit-element'; -import {get, translate} from "lit-translate"; +import { + css, + customElement, + html, + LitElement, + property, + TemplateResult, +} from 'lit-element'; +import { get, translate } from 'lit-translate'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import {newSubWizardEvent, newWizardEvent, Wizard, WizardInputElement} from '@openscd/open-scd/src/foundation.js'; -import {isSCLNamespace} from "@openscd/open-scd/src/schemas.js"; -import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; +import { + newSubWizardEvent, + newWizardEvent, + Wizard, + WizardInputElement, +} from '@compas-oscd/open-scd'; +import { isSCLNamespace } from '@compas-oscd/open-scd'; +import { Nsdoc } from '@compas-oscd/open-scd'; -import {iedHeader, lDeviceHeader, LOCAMATION_MANUFACTURER, LOCAMATION_PRIVATE} from "./foundation.js"; -import {locamationLNListWizard} from "./LocamationLNList.js"; +import { + iedHeader, + lDeviceHeader, + LOCAMATION_MANUFACTURER, + LOCAMATION_PRIVATE, +} from './foundation.js'; +import { locamationLNListWizard } from './LocamationLNList.js'; @customElement('locamation-ied-list') export class LocamationIEDListElement extends LitElement { - @property({type: Document}) + @property({ type: Document }) doc!: XMLDocument; @property() nsdoc!: Nsdoc; private get logicaDevices(): Element[] { - return Array.from(this.doc!.querySelectorAll(`IED[manufacturer="${LOCAMATION_MANUFACTURER}"] LDevice`)) + return Array.from( + this.doc!.querySelectorAll( + `IED[manufacturer="${LOCAMATION_MANUFACTURER}"] LDevice` + ) + ) .filter(isSCLNamespace) - .filter(element => element.querySelector(`LN > Private[type="${LOCAMATION_PRIVATE}"]`) !== null); + .filter( + element => + element.querySelector( + `LN > Private[type="${LOCAMATION_PRIVATE}"]` + ) !== null + ); } close(): void { @@ -32,29 +58,32 @@ export class LocamationIEDListElement extends LitElement { render(): TemplateResult { const lDevices = this.logicaDevices; if (lDevices.length > 0) { - return html ` + return html` ${lDevices.map(lDevice => { - const ied = lDevice.closest('IED')!; - return html` - - ${iedHeader(ied)} - ${lDeviceHeader(lDevice)} - ` - })} + const ied = lDevice.closest('IED')!; + return html` + ${iedHeader(ied)} + ${lDeviceHeader(lDevice)} + `; + })} - ` + `; } - return html ` + return html` - ${translate('locamation.vmu.ied.missing')} + ${translate('locamation.vmu.ied.missing')} `; } @@ -63,13 +92,18 @@ export class LocamationIEDListElement extends LitElement { :host { width: 20vw; } - ` + `; } -export function locamationIEDListWizard(doc: XMLDocument, nsdoc: Nsdoc): Wizard { +export function locamationIEDListWizard( + doc: XMLDocument, + nsdoc: Nsdoc +): Wizard { function close() { return function (inputs: WizardInputElement[], wizard: Element) { - const locamationIEDListElement = wizard.shadowRoot!.querySelector('locamation-ied-list') + const locamationIEDListElement = ( + wizard.shadowRoot!.querySelector('locamation-ied-list') + ); locamationIEDListElement.close(); return []; }; @@ -84,9 +118,11 @@ export function locamationIEDListWizard(doc: XMLDocument, nsdoc: Nsdoc): Wizard action: close(), }, content: [ - html``, + html``, ], }, ]; } - diff --git a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts index 30cbcc93d5..2dac4ad360 100644 --- a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts +++ b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts @@ -8,7 +8,7 @@ import { } from 'lit-element'; import { get, translate } from 'lit-translate'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; +import { patterns } from '@compas-oscd/open-scd'; import { ComplexAction } from '@compas-oscd/core'; import { checkValidity, @@ -16,10 +16,10 @@ import { WizardAction, WizardInputElement, wizardInputSelector, -} from '@openscd/open-scd/src/foundation.js'; -import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +} from '@compas-oscd/open-scd'; +import { Nsdoc } from '@compas-oscd/open-scd'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd/wizard-textfield.js'; import { createEditorAction, diff --git a/packages/compas-open-scd/src/locamation/LocamationLNList.ts b/packages/compas-open-scd/src/locamation/LocamationLNList.ts index 0f5a54cc3e..2283646945 100644 --- a/packages/compas-open-scd/src/locamation/LocamationLNList.ts +++ b/packages/compas-open-scd/src/locamation/LocamationLNList.ts @@ -1,21 +1,40 @@ -import {css, customElement, html, LitElement, property, TemplateResult} from 'lit-element'; -import {get, translate} from "lit-translate"; +import { + css, + customElement, + html, + LitElement, + property, + TemplateResult, +} from 'lit-element'; +import { get, translate } from 'lit-translate'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import {newSubWizardEvent, newWizardEvent, Wizard, WizardInputElement} from '@openscd/open-scd/src/foundation.js'; -import {isSCLNamespace} from "@openscd/open-scd/src/schemas.js"; -import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; +import { + newSubWizardEvent, + newWizardEvent, + Wizard, + WizardInputElement, +} from '@compas-oscd/open-scd'; +import { isSCLNamespace } from '@compas-oscd/open-scd'; +import { Nsdoc } from '@compas-oscd/open-scd'; -import '@openscd/open-scd/src/wizard-textfield.js';; +import '@compas-oscd/open-scd/wizard-textfield.js'; -import {locamationLNEditWizard} from "./LocamationLNEdit.js"; -import {getPrivate, getPrivateTextValue, iedHeader, lDeviceHeader, lnHeader, LOCAMATION_PRIVATE} from "./foundation.js"; +import { locamationLNEditWizard } from './LocamationLNEdit.js'; +import { + getPrivate, + getPrivateTextValue, + iedHeader, + lDeviceHeader, + lnHeader, + LOCAMATION_PRIVATE, +} from './foundation.js'; @customElement('locamation-ln-list') export class LocamationLNodeListElement extends LitElement { - @property({type: Element}) + @property({ type: Element }) lDevice!: Element; @property() nsdoc!: Nsdoc; @@ -23,7 +42,11 @@ export class LocamationLNodeListElement extends LitElement { private get logicaNodes(): Element[] { return Array.from(this.lDevice!.querySelectorAll('LN')) .filter(isSCLNamespace) - .filter(element => element.querySelector(`Private[type="${LOCAMATION_PRIVATE}"]`) !== null); + .filter( + element => + element.querySelector(`Private[type="${LOCAMATION_PRIVATE}"]`) !== + null + ); } close(): void { @@ -35,40 +58,50 @@ export class LocamationLNodeListElement extends LitElement { const logicalNodes = this.logicaNodes; if (logicalNodes.length > 0) { const ied = this.lDevice.closest('IED')!; - return html ` - + return html` + - + ${logicalNodes.map(ln => { const locamationPrivate = getPrivate(ln); - const locamationVersion = getPrivateTextValue(locamationPrivate, 'VERSION'); + const locamationVersion = getPrivateTextValue( + locamationPrivate, + 'VERSION' + ); - return html` - - ${lnHeader(ln, this.nsdoc)} - ` - })} + return html` + ${lnHeader(ln, this.nsdoc)} + `; + })} - ` + `; } - return html ` + return html` - ${translate('locamation.vmu.ied.missing')} + ${translate('locamation.vmu.ied.missing')} `; } @@ -82,13 +115,15 @@ export class LocamationLNodeListElement extends LitElement { display: block; margin-top: 16px; } - ` + `; } export function locamationLNListWizard(lDevice: Element, nsdoc: Nsdoc): Wizard { function close() { return function (inputs: WizardInputElement[], wizard: Element) { - const locamationIEDListElement = wizard.shadowRoot!.querySelector('locamation-ln-list') + const locamationIEDListElement = ( + wizard.shadowRoot!.querySelector('locamation-ln-list') + ); locamationIEDListElement.close(); return []; }; @@ -103,9 +138,11 @@ export function locamationLNListWizard(lDevice: Element, nsdoc: Nsdoc): Wizard { action: close(), }, content: [ - html``, + html``, ], }, ]; } - diff --git a/packages/compas-open-scd/src/locamation/foundation.ts b/packages/compas-open-scd/src/locamation/foundation.ts index b14e66b5ad..bec9de46a9 100644 --- a/packages/compas-open-scd/src/locamation/foundation.ts +++ b/packages/compas-open-scd/src/locamation/foundation.ts @@ -1,4 +1,4 @@ -import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { Nsdoc } from '@compas-oscd/open-scd'; import { getDescriptionAttribute, @@ -6,7 +6,7 @@ import { getNameAttribute, getValue, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@compas-oscd/xml'; import { SimpleAction } from '@compas-oscd/core'; diff --git a/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts b/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts index 4faab67bf1..7e5b6bdc79 100644 --- a/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts +++ b/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts @@ -6,7 +6,7 @@ import { newWizardEvent, Wizard, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import CompasAutoAlignmentElement from '../compas/CompasAutoAlignment.js'; diff --git a/packages/compas-open-scd/src/menu/CompasImportFromApi.ts b/packages/compas-open-scd/src/menu/CompasImportFromApi.ts index c73af3a94f..9bdbcbfd0e 100644 --- a/packages/compas-open-scd/src/menu/CompasImportFromApi.ts +++ b/packages/compas-open-scd/src/menu/CompasImportFromApi.ts @@ -1,9 +1,9 @@ import { html, LitElement } from 'lit-element'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/filtered-list.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd/filtered-list.js'; +import '@compas-oscd/open-scd/wizard-textfield.js'; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; import '../compas/CompasImportFromApi.js'; diff --git a/packages/compas-open-scd/src/menu/CompasMerge.ts b/packages/compas-open-scd/src/menu/CompasMerge.ts index b47a7ad223..c646d66203 100644 --- a/packages/compas-open-scd/src/menu/CompasMerge.ts +++ b/packages/compas-open-scd/src/menu/CompasMerge.ts @@ -1,8 +1,8 @@ import { html, LitElement } from 'lit-element'; import { get } from 'lit-translate'; -import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js'; -import { mergeWizard } from '@openscd/open-scd/src/wizards.js'; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; +import { mergeWizard } from '@compas-oscd/open-scd'; import { DocRetrievedEvent } from '../compas/CompasOpen.js'; diff --git a/packages/compas-open-scd/src/menu/CompasSettings.ts b/packages/compas-open-scd/src/menu/CompasSettings.ts index 897955595c..447fe28e9c 100644 --- a/packages/compas-open-scd/src/menu/CompasSettings.ts +++ b/packages/compas-open-scd/src/menu/CompasSettings.ts @@ -1,7 +1,11 @@ import { html, LitElement } from 'lit-element'; import { get } from 'lit-translate'; -import { newWizardEvent, Wizard, WizardInputElement } from "@openscd/open-scd/src/foundation.js"; +import { + newWizardEvent, + Wizard, + WizardInputElement, +} from '@compas-oscd/open-scd'; import { CompasSettingsElement } from '../compas/CompasSettings.js'; diff --git a/packages/compas-open-scd/src/menu/CompasUpdateSubstation.ts b/packages/compas-open-scd/src/menu/CompasUpdateSubstation.ts index ba306ec9ba..9476efe4b7 100644 --- a/packages/compas-open-scd/src/menu/CompasUpdateSubstation.ts +++ b/packages/compas-open-scd/src/menu/CompasUpdateSubstation.ts @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit-element'; import { get } from 'lit-translate'; -import { newWizardEvent, Wizard } from "@openscd/open-scd/src/foundation.js"; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; import { DocRetrievedEvent } from '../compas/CompasOpen.js'; import { mergeSubstation } from '@openscd/plugins/src/menu/UpdateSubstation.js'; diff --git a/packages/compas-open-scd/src/menu/ExportIEDParams.ts b/packages/compas-open-scd/src/menu/ExportIEDParams.ts index 5d5a22ae5b..daea766561 100644 --- a/packages/compas-open-scd/src/menu/ExportIEDParams.ts +++ b/packages/compas-open-scd/src/menu/ExportIEDParams.ts @@ -2,7 +2,7 @@ import { LitElement, property } from 'lit-element'; import { stringify } from 'csv-stringify/browser/esm/sync'; -import { compareNames } from '@openscd/open-scd/src/foundation.js'; +import { compareNames } from '@compas-oscd/open-scd'; import { stripExtensionFromName } from '../compas/foundation.js'; import { get } from 'lit-translate'; diff --git a/packages/compas-open-scd/src/menu/LocamationVMU.ts b/packages/compas-open-scd/src/menu/LocamationVMU.ts index 72c7acb18b..79dbb9038e 100644 --- a/packages/compas-open-scd/src/menu/LocamationVMU.ts +++ b/packages/compas-open-scd/src/menu/LocamationVMU.ts @@ -1,17 +1,19 @@ -import {LitElement} from 'lit-element'; +import { LitElement } from 'lit-element'; -import {newWizardEvent} from '@openscd/open-scd/src/foundation.js'; -import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; +import { newWizardEvent } from '@compas-oscd/open-scd'; +import { Nsdoc } from '@compas-oscd/open-scd'; -import "../locamation/LocamationIEDList.js"; +import '../locamation/LocamationIEDList.js'; -import {locamationIEDListWizard} from "../locamation/LocamationIEDList.js"; +import { locamationIEDListWizard } from '../locamation/LocamationIEDList.js'; export default class LocamationVMUMenuPlugin extends LitElement { doc!: XMLDocument; nsdoc!: Nsdoc; async run(): Promise { - this.dispatchEvent(newWizardEvent(locamationIEDListWizard(this.doc, this.nsdoc))); + this.dispatchEvent( + newWizardEvent(locamationIEDListWizard(this.doc, this.nsdoc)) + ); } } diff --git a/packages/compas-open-scd/src/open-scd.ts b/packages/compas-open-scd/src/open-scd.ts index b8ca15aabd..1188468267 100644 --- a/packages/compas-open-scd/src/open-scd.ts +++ b/packages/compas-open-scd/src/open-scd.ts @@ -14,18 +14,15 @@ import './addons/CompasSession.js'; import './addons/CompasHistory.js'; import './addons/CompasLayout.js'; -import '@openscd/open-scd/src/addons/Waiter.js'; -import '@openscd/open-scd/src/addons/Settings.js'; -import { - initializeNsdoc, - Nsdoc, -} from '@openscd/open-scd/src/foundation/nsdoc.js'; +import '@compas-oscd/open-scd/addons/Waiter.js'; +import '@compas-oscd/open-scd/addons/Settings.js'; +import { initializeNsdoc, Nsdoc } from '@compas-oscd/open-scd'; import { InstalledOfficialPlugin, Plugin, MenuPosition, PluginKind, -} from '@openscd/open-scd/src/plugin.js'; +} from '@compas-oscd/open-scd'; import { ActionDetail } from '@material/mwc-list'; import { officialPlugins as builtinPlugins } from '../public/js/plugins.js'; @@ -35,9 +32,9 @@ import { classMap } from 'lit-html/directives/class-map.js'; import { newConfigurePluginEvent, ConfigurePluginEvent, -} from '@openscd/open-scd/src/plugin.events.js'; +} from '@compas-oscd/open-scd'; +import { pluginTag } from '@compas-oscd/open-scd'; import { newLogEvent } from '@compas-oscd/core'; -import { pluginTag } from '@openscd/open-scd/src/plugin-tag.js'; import packageJson from '../package.json'; import { CompasSclDataService } from './compas-services/CompasSclDataService.js'; import { createLogEvent } from './compas-services/foundation.js'; diff --git a/packages/compas-open-scd/src/translations/loader.ts b/packages/compas-open-scd/src/translations/loader.ts index ae45c8a87d..6389e78b49 100644 --- a/packages/compas-open-scd/src/translations/loader.ts +++ b/packages/compas-open-scd/src/translations/loader.ts @@ -1,8 +1,8 @@ import { Strings } from 'lit-translate'; import { de as compasDe } from './de.js'; import { en as compasEn } from './en.js'; -import { de as oscdDe } from '@openscd/open-scd/src/translations/de.js'; -import { en as oscdEn } from '@openscd/open-scd/src/translations/en.js'; +import { de as oscdDe } from '@compas-oscd/open-scd'; +import { en as oscdEn } from '@compas-oscd/open-scd'; export type Language = 'en' | 'de'; export const languages = { diff --git a/packages/compas-open-scd/test/integration/compas-editors/CompasVersions.test.ts b/packages/compas-open-scd/test/integration/compas-editors/CompasVersions.test.ts index e2894c36ee..ad38622e81 100644 --- a/packages/compas-open-scd/test/integration/compas-editors/CompasVersions.test.ts +++ b/packages/compas-open-scd/test/integration/compas-editors/CompasVersions.test.ts @@ -1,9 +1,8 @@ import { expect, fixtureSync, html, waitUntil } from '@open-wc/testing'; import sinon, { SinonSpy, spy, SinonStub } from 'sinon'; -import { Wizarding } from '@openscd/open-scd/src/Wizarding.js'; -import '@openscd/open-scd/test/mock-editor-logger.js'; -import { MockEditorLogger } from '@openscd/open-scd/test/mock-editor-logger.js'; +import { Wizarding } from '@compas-oscd/open-scd'; +import '../../mock-editor-logger.js'; import { BASIC_VERSIONS_LIST_RESPONSE, @@ -157,7 +156,11 @@ describe('compas-versions-plugin', () => { }); it('dispatches a wizard event when edit button is clicked', () => { - (element.shadowRoot!.querySelector('mwc-icon-button[icon="edit"]')! as IconButton).click() + ( + element.shadowRoot!.querySelector( + 'mwc-icon-button[icon="edit"]' + )! as IconButton + ).click(); expect(wizardEvent).to.have.been.calledOnce; expect(wizardEvent.args[0][0].detail.wizard()[0].title).to.contain( 'compas.scl.wizardTitle' diff --git a/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts b/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts index 8116cc970a..ef1c5fe62d 100644 --- a/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts +++ b/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-editor-logger.js'; -import { MockEditorLogger } from '@openscd/open-scd/test/mock-editor-logger.js'; +import '../../mock-editor-logger.js'; +import { MockEditorLogger } from '../../mock-editor-logger.js'; import '../../../src/compas-editors/autogen-substation.js'; import CompasAutogenerateSubstation from '../../../src/compas-editors/autogen-substation.js'; @@ -15,7 +15,9 @@ describe('autogen-substation-integration', () => { before(async () => { parent = await fixture(html` - + `); validSCL = await fetch( diff --git a/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts b/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts index 2449a15970..44217e9bcc 100644 --- a/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts +++ b/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts @@ -2,8 +2,8 @@ import { expect, fixture, html } from '@open-wc/testing'; import { stub } from 'sinon'; import { SitipeBay } from '../../../src/compas-editors/sitipe/sitipe-bay.js'; -import '@openscd/open-scd/test/mock-editor-logger.js'; -import { MockEditorLogger } from '@openscd/open-scd/test/mock-editor-logger.js'; +import '../../mock-editor-logger.js'; +import { MockEditorLogger } from '../../mock-editor-logger.js'; describe('sitipe-bay-integration', () => { if (customElements.get('sitipe-bay') === undefined) { diff --git a/packages/compas-open-scd/test/mock-compas-open-scd.ts b/packages/compas-open-scd/test/mock-compas-open-scd.ts index 7a3f8b1cb6..867166ab9c 100644 --- a/packages/compas-open-scd/test/mock-compas-open-scd.ts +++ b/packages/compas-open-scd/test/mock-compas-open-scd.ts @@ -5,10 +5,12 @@ import { queryAssignedNodes, query, } from 'lit-element'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; -import { WizardFactory } from '@openscd/open-scd/src/foundation.js'; +import { + OscdWizards, + WizardFactory, + WizardDialog, +} from '@compas-oscd/open-scd'; import { OpenSCD } from '../src/open-scd.js'; -import { WizardDialog } from '@openscd/open-scd/src/wizard-dialog.js'; import { CompasHistory } from '../src/addons/CompasHistory.js'; import { CompasLayout } from '../src/addons/CompasLayout.js'; @@ -32,9 +34,7 @@ export class MockCompasOpenSCD extends OpenSCD { } render(): TemplateResult { - return html` - ${this.renderHosting()} - ${super.render()}`; + return html` ${this.renderHosting()} ${super.render()}`; } getPlugin(name: string): T | undefined { diff --git a/packages/compas-open-scd/test/mock-editor-logger.ts b/packages/compas-open-scd/test/mock-editor-logger.ts new file mode 100644 index 0000000000..c0a604be67 --- /dev/null +++ b/packages/compas-open-scd/test/mock-editor-logger.ts @@ -0,0 +1,45 @@ +import { + LitElement, + customElement, + property, + state, + html, + query, + TemplateResult, +} from 'lit-element'; + +import '@compas-oscd/open-scd/addons/Editor.js'; +import '@compas-oscd/open-scd/addons/History.js'; +import { OscdEditor } from '@compas-oscd/open-scd/dist/addons/Editor.js'; +import { OscdHistory } from '@compas-oscd/open-scd'; + +@customElement('mock-editor-logger') +export class MockEditorLogger extends LitElement { + @property({ type: Object }) doc!: XMLDocument; + + @property({ type: String }) docName = 'test'; + + @property({ type: String }) docId = 'test'; + + @state() + editCount = -1; + + @query('oscd-history') + history!: OscdHistory; + + @query('oscd-editor') + editor!: OscdEditor; + + render(): TemplateResult { + return html` + + + `; + } +} diff --git a/packages/compas-open-scd/test/mock-edits.ts b/packages/compas-open-scd/test/mock-edits.ts new file mode 100644 index 0000000000..be49a4f387 --- /dev/null +++ b/packages/compas-open-scd/test/mock-edits.ts @@ -0,0 +1,16 @@ +import { Edit, Insert, Remove, Update } from '@openscd/core'; + + +const element = document.createElement('test-element'); +const parent = document.createElement('test-parent'); +const reference = document.createElement('test-sibling'); + +parent.appendChild(element); +parent.appendChild(reference); + +export const mockEdits = { + insert: (): Insert => ({ parent, node: element, reference }), + remove: (): Remove => ({ node: element }), + update: (): Update => ({ element, attributes: { test: 'value' } }), + complex: (): Edit[] => [ mockEdits.insert(), mockEdits.remove(), mockEdits.update() ], +} diff --git a/packages/compas-open-scd/test/mock-open-scd.ts b/packages/compas-open-scd/test/mock-open-scd.ts new file mode 100644 index 0000000000..fc405ece75 --- /dev/null +++ b/packages/compas-open-scd/test/mock-open-scd.ts @@ -0,0 +1,64 @@ +import { + customElement, + TemplateResult, + html, + queryAssignedNodes, + query, + property, +} from 'lit-element'; +import { OscdWizards } from '@compas-oscd/open-scd/dist/addons/Wizards.js'; +import { WizardFactory } from '@compas-oscd/open-scd/dist/foundation.js'; +import { OpenSCD } from '../src/open-scd.js'; +import { WizardDialog } from '@compas-oscd/open-scd/dist/wizard-dialog.js'; +import { OscdHistory } from '@compas-oscd/open-scd/dist/addons/History.js'; +import { OscdLayout } from '@compas-oscd/open-scd/dist/addons/Layout.js'; +// import type { Plugin } from '@openscd/core'; +import { Plugin } from '@compas-oscd/open-scd/dist/plugin.js'; + +@customElement('mock-open-scd') +export class MockOpenSCD extends OpenSCD { + @property({ attribute: false }) + mockPlugins: Plugin[] = []; + + @queryAssignedNodes() + _plugins!: Array; + + @query('oscd-wizards') + wizards!: OscdWizards; + + @query('oscd-history') + historyAddon!: OscdHistory; + + @query('oscd-layout') + layout!: OscdLayout; + + renderHosting(): TemplateResult { + return html``; + } + + render(): TemplateResult { + return html` ${this.renderHosting()} ${super.render()} `; + } + + protected getBuiltInPlugins(): Plugin[] { + return this.mockPlugins; + } + + getPlugin(name: string): T | undefined { + return this._plugins.find( + p => p.tagName.toLowerCase() === name.toLowerCase() + ) as T | undefined; + } + + getActivePlugin(): T { + return this._plugins[0]! as T; + } + + get wizardUI(): WizardDialog { + return this.wizards.wizardUI; + } + + get workflow(): WizardFactory[] { + return this.wizards.workflow; + } +} diff --git a/packages/compas-open-scd/test/mock-plugins.ts b/packages/compas-open-scd/test/mock-plugins.ts new file mode 100644 index 0000000000..814a81cad2 --- /dev/null +++ b/packages/compas-open-scd/test/mock-plugins.ts @@ -0,0 +1,240 @@ + +function generatePluginPath(plugin: string): string { + return location.origin+location.pathname+plugin; +} + +export const officialPlugins = [ + { + name: 'IED', + src: generatePluginPath('plugins/src/editors/IED.js'), + icon: 'developer_board', + default: true, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Substation', + src: generatePluginPath('plugins/src/editors/Substation.js'), + icon: 'margin', + default: true, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Single Line Diagram', + src: generatePluginPath('plugins/src/editors/SingleLineDiagram.js'), + icon: 'edit', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Subscriber Message Binding (GOOSE)', + src: generatePluginPath('plugins/src/editors/GooseSubscriberMessageBinding.js'), + icon: 'link', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Subscriber Data Binding (GOOSE)', + src: generatePluginPath('plugins/src/editors/GooseSubscriberDataBinding.js'), + icon: 'link', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Subscriber Message Binding (SMV)', + src: generatePluginPath('plugins/src/editors/SMVSubscriberMessageBinding.js'), + icon: 'link', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Subscriber Data Binding (SMV)', + src: generatePluginPath('plugins/src/editors/SMVSubscriberDataBinding.js'), + icon: 'link', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Communication', + src: generatePluginPath('plugins/src/editors/Communication.js'), + icon: 'settings_ethernet', + default: true, + kind: 'editor', + requireDoc: true, + }, + { + name: '104', + src: generatePluginPath('plugins/src/editors/Protocol104.js'), + icon: 'settings_ethernet', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Templates', + src: generatePluginPath('plugins/src/editors/Templates.js'), + icon: 'copy_all', + default: true, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Publisher', + src: generatePluginPath('plugins/src/editors/Publisher.js'), + icon: 'publish', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Cleanup', + src: generatePluginPath('plugins/src/editors/Cleanup.js'), + icon: 'cleaning_services', + default: false, + kind: 'editor', + requireDoc: true, + }, + { + name: 'Open project', + src: generatePluginPath('plugins/src/menu/OpenProject.js'), + icon: 'folder_open', + default: true, + kind: 'menu', + requireDoc: false, + position: 'top', + }, + { + name: 'New project', + src: generatePluginPath('plugins/src/menu/NewProject.js'), + icon: 'create_new_folder', + default: true, + kind: 'menu', + requireDoc: false, + position: 'top', + }, + { + name: 'Save project', + src: generatePluginPath('plugins/src/menu/SaveProject.js'), + icon: 'save', + default: true, + kind: 'menu', + requireDoc: true, + position: 'top', + }, + { + name: 'Validate Schema', + src: generatePluginPath('plugins/src/validators/ValidateSchema.js'), + icon: 'rule_folder', + default: true, + kind: 'validator', + }, + { + name: 'Validate Templates', + src: generatePluginPath('plugins/src/validators/ValidateTemplates.js'), + icon: 'rule_folder', + default: true, + kind: 'validator', + }, + { + name: 'Import IEDs', + src: generatePluginPath('plugins/src/menu/ImportIEDs.js'), + icon: 'snippet_folder', + default: true, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Create Virtual IED', + src: generatePluginPath('plugins/src/menu/VirtualTemplateIED.js'), + icon: 'developer_board', + default: false, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Subscriber Update', + src: generatePluginPath('plugins/src/menu/SubscriberInfo.js'), + default: true, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Update desc (ABB)', + src: generatePluginPath('plugins/src/menu/UpdateDescriptionABB.js'), + default: false, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Update desc (SEL)', + src: generatePluginPath('plugins/src/menu/UpdateDescriptionSEL.js'), + default: false, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Merge Project', + src: generatePluginPath('plugins/src/menu/Merge.js'), + icon: 'merge_type', + default: true, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Update Substation', + src: generatePluginPath('plugins/src/menu/UpdateSubstation.js'), + icon: 'merge_type', + default: true, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Compare IED', + src: generatePluginPath('plugins/src/menu/CompareIED.js'), + icon: 'compare_arrows', + default: true, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, + { + name: 'Show SCL History', + src: generatePluginPath('plugins/src/menu/SclHistory.js'), + icon: 'history_toggle_off', + default: true, + kind: 'menu', + requireDoc: true, + position: 'bottom', + }, + { + name: 'Help', + src: generatePluginPath('plugins/src/menu/Help.js'), + icon: 'help', + default: true, + kind: 'menu', + requireDoc: false, + position: 'bottom', + }, + { + name: 'Export Communication Section', + src: generatePluginPath('plugins/src/menu/ExportCommunication.js'), + icon: 'sim_card_download', + default: false, + kind: 'menu', + requireDoc: true, + position: 'middle', + }, +]; diff --git a/packages/compas-open-scd/test/mock-wizard-editor.ts b/packages/compas-open-scd/test/mock-wizard-editor.ts new file mode 100644 index 0000000000..96f1eeaf9d --- /dev/null +++ b/packages/compas-open-scd/test/mock-wizard-editor.ts @@ -0,0 +1,54 @@ +import { + LitElement, + customElement, + TemplateResult, + html, + query, + property, +} from 'lit-element'; + +import '@compas-oscd/open-scd/addons/Wizards.js'; + +import '@compas-oscd/open-scd/addons/Editor.js'; + +import { OscdWizards } from '@compas-oscd/open-scd'; + +@customElement('mock-wizard-editor') +export class MockWizardEditor extends LitElement { + @property({ type: Object }) doc!: XMLDocument; + + @query('oscd-wizards') + wizards!: OscdWizards; + + render(): TemplateResult { + return html` + + + + + + `; + } + + get wizardUI() { + return this.wizards.wizardUI; + } + + get dialog() { + return this.wizardUI.dialog; + } + + get dialogs() { + return this.wizardUI.dialogs; + } + + get workflow() { + return this.wizards.workflow; + } +} diff --git a/packages/compas-open-scd/test/unit/CompasHistoring.test.ts b/packages/compas-open-scd/test/unit/CompasHistoring.test.ts index 9c9e8aed41..03d287ee49 100644 --- a/packages/compas-open-scd/test/unit/CompasHistoring.test.ts +++ b/packages/compas-open-scd/test/unit/CompasHistoring.test.ts @@ -1,11 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/unit/mock-logger.js'; - import { newIssueEvent } from '@compas-oscd/core'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; -import { OscdHistory } from '@openscd/open-scd//src/addons/History.js'; +import { OscdHistory } from '@compas-oscd/open-scd'; +import { MockOpenSCD } from '../mock-open-scd'; describe('HistoringElement', () => { let mock: MockOpenSCD; diff --git a/packages/compas-open-scd/test/unit/compas-wizards/scl.test.ts b/packages/compas-open-scd/test/unit/compas-wizards/scl.test.ts index c0cb20d28b..79700ebddf 100644 --- a/packages/compas-open-scd/test/unit/compas-wizards/scl.test.ts +++ b/packages/compas-open-scd/test/unit/compas-wizards/scl.test.ts @@ -1,10 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; - -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import '../../mock-wizard-editor.js'; +import { MockWizardEditor } from '../../mock-wizard-editor.js'; +import { + newWizardEvent, + WizardTextField, + Wizard, + WizardInputElement, +} from '@compas-oscd/open-scd'; import { Create, isCreate, @@ -13,11 +16,6 @@ import { Replace, } from '@compas-oscd/core'; -import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; - import { fetchDoc, setWizardTextFieldValue, @@ -69,7 +67,8 @@ describe('Wizards for SCL element (CoMPAS)', () => { }); it('update SCL Name should be updated in document', async function () { - await setWizardTextFieldValue(inputs[0], 'updated'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(inputs[0], 'updated'); const complexAction = executeWizardComplexAction( updateSCL(scl), @@ -113,7 +112,8 @@ describe('Wizards for SCL element (CoMPAS)', () => { }); it('update SCL Name should be updated in document', async function () { - await setWizardTextFieldValue(inputs[0], 'updated'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(inputs[0], 'updated'); const complexAction = executeWizardComplexAction( updateSCL(scl), @@ -144,7 +144,8 @@ describe('Wizards for SCL element (CoMPAS)', () => { }); it('update SCL Name should be updated in document', async function () { - await setWizardTextFieldValue(inputs[0], 'updated'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(inputs[0], 'updated'); const complexAction = executeWizardComplexAction( updateSCL(scl), diff --git a/packages/compas-open-scd/test/unit/compas/CompasUploadVersion.test.ts b/packages/compas-open-scd/test/unit/compas/CompasUploadVersion.test.ts index 915c88d5cf..4b2214602f 100644 --- a/packages/compas-open-scd/test/unit/compas/CompasUploadVersion.test.ts +++ b/packages/compas-open-scd/test/unit/compas/CompasUploadVersion.test.ts @@ -1,13 +1,22 @@ -import {expect, fixture, fixtureSync, html, waitUntil} from '@open-wc/testing'; -import sinon from "sinon"; - -import {MockWizardEditor} from "@openscd/open-scd/test/mock-wizard-editor.js"; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; - -import {addVersionToCompasWizard, CompasUploadVersionElement} from "../../../src/compas/CompasUploadVersion.js"; -import {CompasExistsInElement} from "../../../src/compas/CompasExistsIn.js"; -import "../../../src/compas/CompasUploadVersion.js"; +import { + expect, + fixture, + fixtureSync, + html, + waitUntil, +} from '@open-wc/testing'; +import sinon from 'sinon'; + +import { MockWizardEditor } from '../../mock-wizard-editor.js'; +import '../../mock-wizard-editor.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; + +import { + addVersionToCompasWizard, + CompasUploadVersionElement, +} from '../../../src/compas/CompasUploadVersion.js'; +import { CompasExistsInElement } from '../../../src/compas/CompasExistsIn.js'; +import '../../../src/compas/CompasUploadVersion.js'; describe('compas-upload-version', () => { let element: CompasUploadVersionElement & CompasExistsInElement; @@ -17,7 +26,10 @@ describe('compas-upload-version', () => { describe('still determining if document exists in CoMPAS', () => { beforeEach(async () => { element = fixtureSync( - html `` + html`` ); sinon.stub(element, 'checkExistInCompas').callsFake(() => { @@ -35,7 +47,10 @@ describe('compas-upload-version', () => { describe('no document in compas (anymore)', () => { beforeEach(async () => { element = fixtureSync( - html `` + html`` ); sinon.stub(element, 'checkExistInCompas').callsFake(() => { @@ -54,7 +69,10 @@ describe('compas-upload-version', () => { describe('existing document in compas', () => { beforeEach(async () => { element = fixtureSync( - html `` + html`` ); sinon.stub(element, 'checkExistInCompas').callsFake(() => { @@ -68,19 +86,25 @@ describe('compas-upload-version', () => { it('looks like the latest snapshot', async () => { await expect(element).shadowDom.to.equalSnapshot(); }); - }) + }); describe('existing document in compas through wizard', () => { let wizardElement: MockWizardEditor; beforeEach(async () => { - wizardElement = await fixture(html ``); - const wizard = addVersionToCompasWizard({docId: docId, docName: docName}); + wizardElement = await fixture( + html`` + ); + const wizard = addVersionToCompasWizard({ + docId: docId, + docName: docName, + }); wizardElement.dispatchEvent(newWizardEvent(wizard)); await wizardElement.requestUpdate(); - element = wizardElement.wizardUI.dialog! - .querySelector('compas-upload-version')!; + element = wizardElement.wizardUI.dialog!.querySelector< + CompasUploadVersionElement & CompasExistsInElement + >('compas-upload-version')!; sinon.stub(element, 'checkExistInCompas').callsFake(() => { element.existInCompas = true; @@ -93,7 +117,7 @@ describe('compas-upload-version', () => { it('looks like the latest snapshot', async () => { await expect(wizardElement.wizardUI.dialog).to.equalSnapshot(); }); - }) + }); afterEach(() => { sinon.restore(); diff --git a/packages/compas-open-scd/test/unit/compas/test-support.ts b/packages/compas-open-scd/test/unit/compas/test-support.ts index ac6b350b30..43ca25fbf8 100644 --- a/packages/compas-open-scd/test/unit/compas/test-support.ts +++ b/packages/compas-open-scd/test/unit/compas/test-support.ts @@ -1,6 +1,6 @@ import { Button } from '@material/mwc-button'; -import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js"; +import { WizardTextField } from '@compas-oscd/open-scd'; import { CompasLabelsFieldElement } from '../../../src/compas/CompasLabelsField.js'; export async function addLabel( diff --git a/packages/compas-open-scd/test/unit/locamation/LocamationIEDList.test.ts b/packages/compas-open-scd/test/unit/locamation/LocamationIEDList.test.ts index 764505f0f9..ae55371f1c 100644 --- a/packages/compas-open-scd/test/unit/locamation/LocamationIEDList.test.ts +++ b/packages/compas-open-scd/test/unit/locamation/LocamationIEDList.test.ts @@ -1,11 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import {MockWizardEditor} from "@openscd/open-scd/test/mock-wizard-editor.js"; -import {fetchDoc} from "@openscd/plugins/test/unit/wizards/test-support.js"; -import {initializeNsdoc, Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js" +import { MockWizardEditor } from '../../mock-wizard-editor.js'; +import { fetchDoc } from '@openscd/plugins/test/unit/wizards/test-support.js'; +import { initializeNsdoc, Nsdoc, newWizardEvent } from '@compas-oscd/open-scd'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '../../mock-wizard-editor.js'; import { LocamationIEDListElement, diff --git a/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts b/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts index 4c960877c4..dcf441171e 100644 --- a/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts +++ b/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import { MockWizardEditor } from '../../mock-wizard-editor.js'; import { fetchDoc, setWizardTextFieldValue, @@ -8,13 +8,13 @@ import { import { initializeNsdoc, Nsdoc, -} from '@openscd/open-scd/src/foundation/nsdoc.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardAction } from '@openscd/open-scd/src/foundation.js'; + WizardTextField, + WizardAction, + newWizardEvent, +} from '@compas-oscd/open-scd'; import { ComplexAction, isSimple, isReplace, Replace } from '@compas-oscd/core'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '../../mock-wizard-editor.js'; import { LocamationVMUEditElement, @@ -71,10 +71,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the identifier with valid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[4], - '10.10.8' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[4], '10.10.8'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('10.12.14'); @@ -82,17 +80,16 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the identifier with invalid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[4], - '10.10.AA' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[4], '10.10.AA'); const complexActions = element.save(); expect(complexActions).to.be.empty; }); it('when saving and updating the transform first with valid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[6], '2000'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[6], '2000'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('1000'); @@ -100,14 +97,16 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the transform first with invalid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[6], 'AAAA'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[6], 'AAAA'); const complexActions = element.save(); expect(complexActions).to.be.empty; }); it('when saving and updating the transform second with valid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[7], '40'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[7], '40'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('20'); @@ -115,7 +114,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the transform second with invalid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[7], 'AA'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[7], 'AA'); const complexActions = element.save(); expect(complexActions).to.be.empty; @@ -138,7 +138,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the channel with valid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[5], '3'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '3'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('0'); @@ -146,7 +147,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the channel with invalid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[5], '6'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '6'); const complexActions = element.save(); expect(complexActions).to.be.empty; @@ -173,10 +175,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the sum with valid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[5], - '3,4,5' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '3,4,5'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('0,1,2'); @@ -184,10 +184,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the sum with invalid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[5], - '6,7,8' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '6,7,8'); const complexActions = element.save(); expect(complexActions).to.be.empty; @@ -214,7 +212,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the channel with valid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[5], '2'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '2'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('0'); @@ -222,7 +221,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the channel with invalid value returns a update action', async () => { - await setWizardTextFieldValue(element.inputs[5], '3'); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '3'); const complexActions = element.save(); expect(complexActions).to.be.empty; @@ -249,10 +249,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the sum with valid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[5], - '2,1,0' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '2,1,0'); const replaceAction = validateAndRetrieveReplaceAction(element.save()); expect(replaceAction.old.element).to.have.text('0,1,2'); @@ -260,10 +258,8 @@ describe('Wizards for Locamation Plugin to edit the selected Logical Node - ', ( }); it('when saving and updating the sum with invalid value returns a update action', async () => { - await setWizardTextFieldValue( - element.inputs[5], - '3,4,5' - ); + // TODO: Re-add WizardTextField cast after packages/openscd is removed + await setWizardTextFieldValue(element.inputs[5], '3,4,5'); const complexActions = element.save(); expect(complexActions).to.be.empty; diff --git a/packages/compas-open-scd/test/unit/locamation/LocamationLNList.test.ts b/packages/compas-open-scd/test/unit/locamation/LocamationLNList.test.ts index 0076252f28..6b4b091657 100644 --- a/packages/compas-open-scd/test/unit/locamation/LocamationLNList.test.ts +++ b/packages/compas-open-scd/test/unit/locamation/LocamationLNList.test.ts @@ -1,15 +1,17 @@ -import {expect, fixture, html} from "@open-wc/testing"; +import { expect, fixture, html } from '@open-wc/testing'; -import {MockWizardEditor} from "@openscd/open-scd/test/mock-wizard-editor.js"; -import {fetchDoc} from "@openscd/plugins/test/unit/wizards/test-support.js"; -import {initializeNsdoc, Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; +import { MockWizardEditor } from '../../mock-wizard-editor.js'; +import { fetchDoc } from '@openscd/plugins/test/unit/wizards/test-support.js'; +import { initializeNsdoc, Nsdoc, newWizardEvent } from '@compas-oscd/open-scd'; -import "@openscd/open-scd/test/mock-wizard-editor.js"; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '../../mock-wizard-editor.js'; -import {LocamationLNodeListElement, locamationLNListWizard} from "../../../src/locamation/LocamationLNList.js"; +import { + LocamationLNodeListElement, + locamationLNListWizard, +} from '../../../src/locamation/LocamationLNList.js'; -import "../../../src/locamation/LocamationLNList.js"; +import '../../../src/locamation/LocamationLNList.js'; describe('Wizards for Locamation Plugin to select the Logical Node - ', () => { let nsdoc: Nsdoc; @@ -25,7 +27,7 @@ describe('Wizards for Locamation Plugin to select the Logical Node - ', () => { let element: MockWizardEditor; beforeEach(async () => { - lDevice = doc.querySelector('LDevice[inst="MU01"]')! + lDevice = doc.querySelector('LDevice[inst="MU01"]')!; element = await fixture(html``); const wizard = locamationLNListWizard(lDevice, nsdoc); @@ -44,7 +46,12 @@ describe('Wizards for Locamation Plugin to select the Logical Node - ', () => { beforeEach(async () => { lDevice = doc.querySelector('LDevice[inst="MU01"]')!; - element = await fixture(html``); + element = await fixture( + html`` + ); await element.requestUpdate(); }); @@ -59,7 +66,12 @@ describe('Wizards for Locamation Plugin to select the Logical Node - ', () => { beforeEach(async () => { lDevice = doc.querySelector('LDevice[inst="MU02"]')!; - element = await fixture(html``); + element = await fixture( + html`` + ); await element.requestUpdate(); }); diff --git a/packages/compas-open-scd/test/unit/locamation/foundation.test.ts b/packages/compas-open-scd/test/unit/locamation/foundation.test.ts index f1ed82588c..c619d28a0e 100644 --- a/packages/compas-open-scd/test/unit/locamation/foundation.test.ts +++ b/packages/compas-open-scd/test/unit/locamation/foundation.test.ts @@ -1,7 +1,7 @@ import { expect } from '@open-wc/testing'; import { Create, isCreate, isReplace, Replace } from '@compas-oscd/core'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import { addPrefixAndNamespaceToDocument, diff --git a/packages/compas-open-scd/test/unit/wizards/compas-test-support.ts b/packages/compas-open-scd/test/unit/wizards/compas-test-support.ts index c3dcc7bc9c..4d8a74e496 100644 --- a/packages/compas-open-scd/test/unit/wizards/compas-test-support.ts +++ b/packages/compas-open-scd/test/unit/wizards/compas-test-support.ts @@ -1,10 +1,7 @@ import { expect } from '@open-wc/testing'; import { ComplexAction, isSimple } from '@compas-oscd/core'; -import { - WizardActor, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { WizardActor, WizardInputElement } from '@compas-oscd/open-scd'; export function executeWizardComplexAction( wizardActor: WizardActor, diff --git a/packages/distribution/main.ts b/packages/distribution/main.ts index fe7e442d65..9864c6d03c 100644 --- a/packages/distribution/main.ts +++ b/packages/distribution/main.ts @@ -1 +1 @@ -import '@openscd/open-scd/src/open-scd.js'; +import '@compas-oscd/open-scd/src/open-scd.js'; diff --git a/packages/openscd/src/Wizarding.ts b/packages/openscd/src/Wizarding.ts index 018876114b..7c901cfd83 100644 --- a/packages/openscd/src/Wizarding.ts +++ b/packages/openscd/src/Wizarding.ts @@ -40,7 +40,9 @@ export function Wizarding(Base: TBase) { constructor(...args: any[]) { super(...args); - this.addEventListener('wizard', this.onWizard); + this.addEventListener('wizard', (evt: Event) => + this.onWizard(evt as WizardEvent) + ); this.addEventListener('editor-action', () => this.wizardUI.requestUpdate() ); diff --git a/packages/openscd/src/addons/Wizards.ts b/packages/openscd/src/addons/Wizards.ts index 1cfad52a93..70cc5d1702 100644 --- a/packages/openscd/src/addons/Wizards.ts +++ b/packages/openscd/src/addons/Wizards.ts @@ -45,7 +45,9 @@ export class OscdWizards extends LitElement { connectedCallback() { super.connectedCallback(); - this.host.addEventListener('wizard', this.onWizard.bind(this)); + this.host.addEventListener('wizard', (evt: Event) => + this.onWizard(evt as WizardEvent) + ); this.host.addEventListener('editor-action', () => this.wizardUI.requestUpdate() ); diff --git a/packages/openscd/src/foundation.ts b/packages/openscd/src/foundation.ts index 17996e42fe..b96cf62056 100644 --- a/packages/openscd/src/foundation.ts +++ b/packages/openscd/src/foundation.ts @@ -360,7 +360,9 @@ function lNodeSelector(tagName: SCLTag, identity: string): string { return crossProduct( parentSelectors, ['>'], - [`${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"][lnInst="${lnInst}"]`] + [ + `${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"][lnInst="${lnInst}"]`, + ] ) .map(strings => strings.join('')) .join(','); @@ -2531,9 +2533,3 @@ export function minAvailableLogicalNodeInstance( const lnInsts = new Set(lnElements.map(ln => ln.getAttribute('inst') || '')); return lnInstRange.find(lnInst => !lnInsts.has(lnInst)); } - -declare global { - interface ElementEventMap { - ['wizard']: WizardEvent; - } -} diff --git a/packages/openscd/test/unit/wizard-dialog.test.ts b/packages/openscd/test/unit/wizard-dialog.test.ts index 458a19705b..8622670c0d 100644 --- a/packages/openscd/test/unit/wizard-dialog.test.ts +++ b/packages/openscd/test/unit/wizard-dialog.test.ts @@ -9,7 +9,12 @@ import { checkValidity, WizardInputElement } from '../../src/foundation.js'; import { WizardCheckbox } from '../../src/wizard-checkbox.js'; import { WizardSelect } from '../../src/wizard-select.js'; import { WizardTextField } from '../../src/wizard-textfield.js'; -import { ComplexAction, Create, Delete, EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; +import { + ComplexAction, + Create, + Delete, + EditorAction, +} from '@openscd/core/foundation/deprecated/editor.js'; describe('wizard-dialog', () => { let element: WizardDialog; @@ -271,7 +276,10 @@ describe('wizard-dialog', () => { it('commits the code action on primary button click', async () => { let editorAction: ComplexAction; - element.addEventListener('editor-action', (action) => editorAction = action.detail.action as ComplexAction); + element.addEventListener( + 'editor-action', + action => (editorAction = action.detail.action as ComplexAction) + ); element.dialog ?.querySelector('ace-editor') @@ -295,8 +303,12 @@ describe('wizard-dialog', () => { }, }; - expect((deleteAction as Delete).old).to.deep.equal(expectedDeleteAction.old); - expect(((createAction as Create).new.element as Element).tagName).to.equal('success') + expect((deleteAction as Delete).old).to.deep.equal( + expectedDeleteAction.old + ); + expect( + ((createAction as Create).new.element as Element).tagName + ).to.equal('success'); }); }); diff --git a/packages/plugins/package.json b/packages/plugins/package.json index a925d00edc..c6e1b51689 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -17,6 +17,7 @@ "type": "module", "private": true, "dependencies": { + "@compas-oscd/open-scd": "^0.34.42", "@material/mwc-dialog": "0.22.1", "@material/mwc-fab": "0.22.1", "@material/mwc-formfield": "0.22.1", diff --git a/packages/plugins/src/editors/Communication.ts b/packages/plugins/src/editors/Communication.ts index 605a6af9a3..4976311b19 100644 --- a/packages/plugins/src/editors/Communication.ts +++ b/packages/plugins/src/editors/Communication.ts @@ -4,7 +4,7 @@ import { get } from 'lit-translate'; import '@material/mwc-fab'; import './communication/subnetwork-editor.js'; -import { newWizardEvent, isPublic } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, isPublic } from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/GooseSubscriberDataBinding.ts b/packages/plugins/src/editors/GooseSubscriberDataBinding.ts index 4d1c3a75a3..94a27886fa 100644 --- a/packages/plugins/src/editors/GooseSubscriberDataBinding.ts +++ b/packages/plugins/src/editors/GooseSubscriberDataBinding.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, property, TemplateResult } from 'lit-element'; -import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { Nsdoc } from '@compas-oscd/open-scd'; import './subscription/fcda-binding-list.js'; import './subscription/later-binding/ext-ref-ln-binding-list.js'; diff --git a/packages/plugins/src/editors/IED.ts b/packages/plugins/src/editors/IED.ts index 2ce7c4d4cc..70ee9d05bf 100644 --- a/packages/plugins/src/editors/IED.ts +++ b/packages/plugins/src/editors/IED.ts @@ -13,7 +13,7 @@ import { nothing } from 'lit-html'; import '@material/mwc-list/mwc-check-list-item'; import '@material/mwc-list/mwc-radio-list-item'; import '@material/mwc-button'; -import '@openscd/open-scd/src/oscd-filter-button.js'; +import '@compas-oscd/open-scd'; import './ied/ied-container.js'; import './ied/element-path.js'; @@ -28,10 +28,10 @@ import { compareNames, getDescriptionAttribute, getNameAttribute, -} from '@openscd/open-scd/src/foundation.js'; -import { SelectedItemsChangedEvent } from '@openscd/open-scd/src/oscd-filter-button.js'; -import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; -import { getIcon } from '@openscd/open-scd/src/icons/icons.js'; +} from '@compas-oscd/open-scd'; +import { SelectedItemsChangedEvent } from '@compas-oscd/open-scd'; +import { Nsdoc } from '@compas-oscd/open-scd'; +import { getIcon } from '@compas-oscd/open-scd'; import { OscdApi, newEditEventV2, InsertV2 } from '@openscd/core'; import { CreateIedDialog } from './ied/create-ied-dialog.js'; diff --git a/packages/plugins/src/editors/SMVSubscriberDataBinding.ts b/packages/plugins/src/editors/SMVSubscriberDataBinding.ts index a38b09d16c..9007dedd77 100644 --- a/packages/plugins/src/editors/SMVSubscriberDataBinding.ts +++ b/packages/plugins/src/editors/SMVSubscriberDataBinding.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, property, TemplateResult } from 'lit-element'; -import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { Nsdoc } from '@compas-oscd/open-scd'; import './subscription/fcda-binding-list.js'; import './subscription/later-binding/ext-ref-ln-binding-list.js'; diff --git a/packages/plugins/src/editors/SingleLineDiagram.ts b/packages/plugins/src/editors/SingleLineDiagram.ts index 3792f11247..4c94971445 100644 --- a/packages/plugins/src/editors/SingleLineDiagram.ts +++ b/packages/plugins/src/editors/SingleLineDiagram.ts @@ -18,7 +18,7 @@ import { identity, newWizardEvent, SCLTag, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { addLabelToBay, addLabelToBusBar, @@ -44,7 +44,7 @@ import { getConnectedTerminals, isBusBar, } from './singlelinediagram/foundation.js'; -import { isSCLNamespace } from '@openscd/open-scd/src/schemas.js'; +import { isSCLNamespace } from '@compas-oscd/open-scd'; import { wizards } from './singlelinediagram/wizards/wizard-library.js'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; import { get } from 'lit-translate'; diff --git a/packages/plugins/src/editors/Substation.ts b/packages/plugins/src/editors/Substation.ts index f52b95db6e..30953e9e26 100644 --- a/packages/plugins/src/editors/Substation.ts +++ b/packages/plugins/src/editors/Substation.ts @@ -4,7 +4,7 @@ import { get } from 'lit-translate'; import '@material/mwc-fab'; import './substation/zeroline-pane.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { wizards } from '../wizards/wizard-library.js'; /** An editor [[`plugin`]] for editing the `Substation` section. */ diff --git a/packages/plugins/src/editors/Templates.ts b/packages/plugins/src/editors/Templates.ts index b2d97900b8..0f47c3799d 100644 --- a/packages/plugins/src/editors/Templates.ts +++ b/packages/plugins/src/editors/Templates.ts @@ -6,8 +6,8 @@ import '@material/mwc-icon-button'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/filtered-list.js'; -import { identity, newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd/filtered-list.js'; +import { identity, newWizardEvent } from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/cleanup/control-blocks-container.ts b/packages/plugins/src/editors/cleanup/control-blocks-container.ts index 5bab88f383..b08a68fa76 100644 --- a/packages/plugins/src/editors/cleanup/control-blocks-container.ts +++ b/packages/plugins/src/editors/cleanup/control-blocks-container.ts @@ -24,20 +24,19 @@ import { Checkbox } from '@material/mwc-checkbox'; import { List, MWCListIndex } from '@material/mwc-list'; import { ListItem } from '@material/mwc-list/mwc-list-item.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd/filtered-list.js'; +import { identity, isPublic, newSubWizardEvent } from '@compas-oscd/open-scd'; import { - identity, - isPublic, - newSubWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; -import { Delete, newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; + Delete, + newActionEvent, +} from '@openscd/core/foundation/deprecated/editor.js'; import { styles } from '../templates/foundation.js'; import { controlBlockIcons, getFilterIcon, iconType, -} from '@openscd/open-scd/src/icons/icons.js'; +} from '@compas-oscd/open-scd'; import { editGseControlWizard, getGSE } from '../../wizards/gsecontrol.js'; import { editReportControlWizard } from '../../wizards/reportcontrol.js'; import { diff --git a/packages/plugins/src/editors/cleanup/datasets-container.ts b/packages/plugins/src/editors/cleanup/datasets-container.ts index 4e7985504d..cdd7c4023e 100644 --- a/packages/plugins/src/editors/cleanup/datasets-container.ts +++ b/packages/plugins/src/editors/cleanup/datasets-container.ts @@ -22,15 +22,11 @@ import { Button } from '@material/mwc-button'; import { List, MWCListIndex } from '@material/mwc-list'; import { ListItem } from '@material/mwc-list/mwc-list-item.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd/filtered-list.js'; import { editDataSetWizard } from '../../wizards/dataset.js'; import { styles } from '../templates/foundation.js'; -import { - identity, - isPublic, - newSubWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, isPublic, newSubWizardEvent } from '@compas-oscd/open-scd'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { cleanSCLItems, identitySort } from './foundation.js'; diff --git a/packages/plugins/src/editors/cleanup/datatypes-container.ts b/packages/plugins/src/editors/cleanup/datatypes-container.ts index ce2aaec900..a7f68c3293 100644 --- a/packages/plugins/src/editors/cleanup/datatypes-container.ts +++ b/packages/plugins/src/editors/cleanup/datatypes-container.ts @@ -24,13 +24,9 @@ import { Checkbox } from '@material/mwc-checkbox'; import { List, MWCListIndex } from '@material/mwc-list'; import { ListItem } from '@material/mwc-list/mwc-list-item.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd/filtered-list.js'; -import { - identity, - isPublic, - newSubWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, isPublic, newSubWizardEvent } from '@compas-oscd/open-scd'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js'; @@ -39,7 +35,7 @@ import { dataTypeTemplateIcons, getFilterIcon, iconType, -} from '@openscd/open-scd/src/icons/icons.js'; +} from '@compas-oscd/open-scd'; import { lNodeTypeWizard } from '../templates/lnodetype-wizard.js'; import { editDaTypeWizard } from '../templates/datype-wizards.js'; diff --git a/packages/plugins/src/editors/cleanup/foundation.ts b/packages/plugins/src/editors/cleanup/foundation.ts index 4aac403cf8..98ce15017e 100644 --- a/packages/plugins/src/editors/cleanup/foundation.ts +++ b/packages/plugins/src/editors/cleanup/foundation.ts @@ -1,6 +1,6 @@ 'use strict'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { Delete } from '@openscd/core/foundation/deprecated/editor.js'; /** diff --git a/packages/plugins/src/editors/communication/connectedap-editor.ts b/packages/plugins/src/editors/communication/connectedap-editor.ts index 84296c56db..5e458f966f 100644 --- a/packages/plugins/src/editors/communication/connectedap-editor.ts +++ b/packages/plugins/src/editors/communication/connectedap-editor.ts @@ -8,8 +8,8 @@ import { import '@material/mwc-fab'; -import '@openscd/open-scd/src/action-icon.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd/action-icon.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { editConnectedApWizard } from '../../wizards/connectedap.js'; diff --git a/packages/plugins/src/editors/communication/gse-editor.ts b/packages/plugins/src/editors/communication/gse-editor.ts index c1241d8604..0197d6cc8b 100644 --- a/packages/plugins/src/editors/communication/gse-editor.ts +++ b/packages/plugins/src/editors/communication/gse-editor.ts @@ -10,12 +10,15 @@ import { import '@material/mwc-icon'; -import '@openscd/open-scd/src/action-icon.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd/action-icon.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; -import { sizableGooseIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { sizableGooseIcon } from '@compas-oscd/open-scd'; import { editGseWizard } from '../../wizards/gse.js'; -import { canMoveCommunicationElementToConnectedAP, getAllConnectedAPsOfSameIED } from './foundation.js'; +import { + canMoveCommunicationElementToConnectedAP, + getAllConnectedAPsOfSameIED, +} from './foundation.js'; @customElement('gse-editor') export class GseEditor extends LitElement { @@ -65,11 +68,9 @@ export class GseEditor extends LitElement { const validTargetConnectedAPs = getAllConnectedAPsOfSameIED( this.element, this.doc - ).filter(cap => canMoveCommunicationElementToConnectedAP( - this.element!, - cap, - this.doc - )); + ).filter(cap => + canMoveCommunicationElementToConnectedAP(this.element!, cap, this.doc) + ); const hasValidConnectedAPMoveTarget = validTargetConnectedAPs.length > 0; return html` canMoveCommunicationElementToConnectedAP( - this.element!, - cap, - this.doc - )); + ).filter(cap => + canMoveCommunicationElementToConnectedAP(this.element!, cap, this.doc) + ); const hasValidConnectedAPMoveTarget = validTargetConnectedAPs.length > 0; return html` canMoveCommunicationElementToConnectedAP( - this.moveTargetElement!, - cap, - this.doc - )); + const validTargetConnectedAPs = allConnectedAPs.filter(cap => + canMoveCommunicationElementToConnectedAP( + this.moveTargetElement!, + cap, + this.doc + ) + ); return html` `; + > `; } } diff --git a/packages/plugins/src/editors/substation/l-node-editor.ts b/packages/plugins/src/editors/substation/l-node-editor.ts index 9c0aeb4256..154b7c2afc 100644 --- a/packages/plugins/src/editors/substation/l-node-editor.ts +++ b/packages/plugins/src/editors/substation/l-node-editor.ts @@ -7,16 +7,14 @@ import { state, } from 'lit-element'; -import '@openscd/open-scd/src/action-icon.js'; +import '@compas-oscd/open-scd'; import { identity, newLnInstGenerator, newWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - cloneElement, -} from '@openscd/xml'; +import { cloneElement } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { @@ -36,7 +34,7 @@ import { switchgearLogicalNode, systemLogicalNode, transformerLogicalNode, -} from '@openscd/open-scd/src/icons/lnode.js'; +} from '@compas-oscd/open-scd'; import { wizards } from '../../wizards/wizard-library.js'; export function getLNodeIcon(lNode: Element): TemplateResult { diff --git a/packages/plugins/src/editors/substation/line-editor.ts b/packages/plugins/src/editors/substation/line-editor.ts index 69c719b8f2..ee2c047e7a 100644 --- a/packages/plugins/src/editors/substation/line-editor.ts +++ b/packages/plugins/src/editors/substation/line-editor.ts @@ -23,17 +23,11 @@ import './function-editor.js'; import './general-equipment-editor.js'; import './l-node-editor.js'; -import { lineIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { lineIcon } from '@compas-oscd/open-scd'; import { styles } from './foundation.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; diff --git a/packages/plugins/src/editors/substation/powertransformer-editor.ts b/packages/plugins/src/editors/substation/powertransformer-editor.ts index fa6f1b2f94..5f1989ea49 100644 --- a/packages/plugins/src/editors/substation/powertransformer-editor.ts +++ b/packages/plugins/src/editors/substation/powertransformer-editor.ts @@ -17,22 +17,16 @@ import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Menu } from '@material/mwc-menu'; -import '@openscd/open-scd/src/action-icon.js'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import './sub-equipment-editor.js'; import './eq-function-editor.js'; import './transformer-winding-editor.js'; -import { powerTransformerTwoWindingIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { powerTransformerTwoWindingIcon } from '@compas-oscd/open-scd'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { startMove, styles } from './foundation.js'; diff --git a/packages/plugins/src/editors/substation/process-editor.ts b/packages/plugins/src/editors/substation/process-editor.ts index 4a99f81ac0..b76a76b310 100644 --- a/packages/plugins/src/editors/substation/process-editor.ts +++ b/packages/plugins/src/editors/substation/process-editor.ts @@ -27,17 +27,11 @@ import './process-editor.js'; import './substation-editor.js'; import './process-editor.js'; -import { processIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { processIcon } from '@compas-oscd/open-scd'; import { styles } from './foundation.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; diff --git a/packages/plugins/src/editors/substation/sub-equipment-editor.ts b/packages/plugins/src/editors/substation/sub-equipment-editor.ts index a9658e17d6..d0c488886b 100644 --- a/packages/plugins/src/editors/substation/sub-equipment-editor.ts +++ b/packages/plugins/src/editors/substation/sub-equipment-editor.ts @@ -17,15 +17,11 @@ import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Menu } from '@material/mwc-menu'; -import '@openscd/open-scd/src/action-icon.js'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import './l-node-editor.js'; import './eq-function-editor.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; import { getChildElementsByTagName } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/substation/sub-function-editor.ts b/packages/plugins/src/editors/substation/sub-function-editor.ts index daf7f31570..faa03427af 100644 --- a/packages/plugins/src/editors/substation/sub-function-editor.ts +++ b/packages/plugins/src/editors/substation/sub-function-editor.ts @@ -17,14 +17,10 @@ import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Menu } from '@material/mwc-menu'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; import './sub-function-editor.js'; import './general-equipment-editor.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; import { getChildElementsByTagName } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/substation/substation-editor.ts b/packages/plugins/src/editors/substation/substation-editor.ts index b0509a8b03..8b8590d45c 100644 --- a/packages/plugins/src/editors/substation/substation-editor.ts +++ b/packages/plugins/src/editors/substation/substation-editor.ts @@ -17,21 +17,15 @@ import { Menu } from '@material/mwc-menu'; import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; import './ied-editor.js'; import './powertransformer-editor.js'; import './voltage-level-editor.js'; import './general-equipment-editor.js'; -import { substationIcon } from '@openscd/open-scd/src/icons/icons.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { substationIcon } from '@compas-oscd/open-scd'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; diff --git a/packages/plugins/src/editors/substation/tapchanger-editor.ts b/packages/plugins/src/editors/substation/tapchanger-editor.ts index 4426d5398f..6a735d216b 100644 --- a/packages/plugins/src/editors/substation/tapchanger-editor.ts +++ b/packages/plugins/src/editors/substation/tapchanger-editor.ts @@ -18,21 +18,15 @@ import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Menu } from '@material/mwc-menu'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; import './eq-function-editor.js'; import './l-node-editor.js'; import './sub-equipment-editor.js'; import { styles } from './foundation.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; diff --git a/packages/plugins/src/editors/substation/transformer-winding-editor.ts b/packages/plugins/src/editors/substation/transformer-winding-editor.ts index a7b2b43bda..547c7eae50 100644 --- a/packages/plugins/src/editors/substation/transformer-winding-editor.ts +++ b/packages/plugins/src/editors/substation/transformer-winding-editor.ts @@ -18,23 +18,17 @@ import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Menu } from '@material/mwc-menu'; -import '@openscd/open-scd/src/action-icon.js'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import './eq-function-editor.js'; import './l-node-editor.js'; import './tapchanger-editor.js'; -import { transformerWindingIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { transformerWindingIcon } from '@compas-oscd/open-scd'; import { styles } from './foundation.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; diff --git a/packages/plugins/src/editors/substation/voltage-level-editor.ts b/packages/plugins/src/editors/substation/voltage-level-editor.ts index dd77ce1193..db24d3327a 100644 --- a/packages/plugins/src/editors/substation/voltage-level-editor.ts +++ b/packages/plugins/src/editors/substation/voltage-level-editor.ts @@ -16,7 +16,7 @@ import { Menu } from '@material/mwc-menu'; import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/action-pane.js'; +import '@compas-oscd/open-scd'; import './bay-editor.js'; import './general-equipment-editor.js'; import './ied-editor.js'; @@ -29,18 +29,12 @@ import { renderGeneralEquipment, redirectDialog, } from './foundation.js'; -import { - newWizardEvent, - SCLTag, - tags, -} from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, SCLTag, tags } from '@compas-oscd/open-scd'; -import { - getChildElementsByTagName, -} from '@openscd/xml'; +import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; -import { voltageLevelIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { voltageLevelIcon } from '@compas-oscd/open-scd'; import { SubstationEditor } from './substation-editor.js'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; import { Dialog } from '@material/mwc-dialog'; diff --git a/packages/plugins/src/editors/substation/zeroline-pane.ts b/packages/plugins/src/editors/substation/zeroline-pane.ts index 9900658eac..7e0dcb0b9e 100644 --- a/packages/plugins/src/editors/substation/zeroline-pane.ts +++ b/packages/plugins/src/editors/substation/zeroline-pane.ts @@ -20,11 +20,11 @@ import './line-editor.js'; import './process-editor.js'; import './substation-editor.js'; import './ied-editor.js'; -import { isPublic, newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { isPublic, newWizardEvent } from '@compas-oscd/open-scd'; import { emptyWizard, wizards } from '../../wizards/wizard-library.js'; import { getAttachedIeds } from './foundation.js'; -import { SCLTag, tags } from '@openscd/open-scd/src/foundation.js'; +import { SCLTag, tags } from '@compas-oscd/open-scd'; import { Settings } from '@openscd/core/foundation/deprecated/settings.js'; function shouldShowIEDs(): boolean { diff --git a/packages/plugins/src/editors/templates/datype-wizards.ts b/packages/plugins/src/editors/templates/datype-wizards.ts index 47a98b88e0..44519d2760 100644 --- a/packages/plugins/src/editors/templates/datype-wizards.ts +++ b/packages/plugins/src/editors/templates/datype-wizards.ts @@ -10,7 +10,7 @@ import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -22,7 +22,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/templates/dotype-wizards.ts b/packages/plugins/src/editors/templates/dotype-wizards.ts index 71985dd492..d21faba5a2 100644 --- a/packages/plugins/src/editors/templates/dotype-wizards.ts +++ b/packages/plugins/src/editors/templates/dotype-wizards.ts @@ -10,7 +10,7 @@ import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { List } from '@material/mwc-list'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -22,7 +22,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/templates/enumtype-wizard.ts b/packages/plugins/src/editors/templates/enumtype-wizard.ts index 4ef6d1e930..c36bc8d094 100644 --- a/packages/plugins/src/editors/templates/enumtype-wizard.ts +++ b/packages/plugins/src/editors/templates/enumtype-wizard.ts @@ -10,7 +10,7 @@ import { ListItem } from '@material/mwc-list/mwc-list-item'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; import { Select } from '@material/mwc-select'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -22,7 +22,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/editors/templates/foundation.ts b/packages/plugins/src/editors/templates/foundation.ts index 5e65c18244..75a25bfca3 100644 --- a/packages/plugins/src/editors/templates/foundation.ts +++ b/packages/plugins/src/editors/templates/foundation.ts @@ -2,7 +2,7 @@ import { css } from 'lit-element'; import '@material/mwc-list/mwc-list-item'; -import { isPublic } from '@openscd/open-scd/src/foundation.js'; +import { isPublic } from '@compas-oscd/open-scd'; import { Create } from '@openscd/core/foundation/deprecated/editor'; export interface UpdateOptions { diff --git a/packages/plugins/src/editors/templates/lnodetype-wizard.ts b/packages/plugins/src/editors/templates/lnodetype-wizard.ts index 5dc7ae94c7..0bd6ef9af8 100644 --- a/packages/plugins/src/editors/templates/lnodetype-wizard.ts +++ b/packages/plugins/src/editors/templates/lnodetype-wizard.ts @@ -10,9 +10,9 @@ import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -25,7 +25,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, @@ -39,7 +39,7 @@ import { newActionEvent, Replace, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; import { addReferencedDataTypes, allDataTypeSelector, diff --git a/packages/plugins/src/menu/CompareIED.ts b/packages/plugins/src/menu/CompareIED.ts index 5bd12d12ef..e3f0519b77 100644 --- a/packages/plugins/src/menu/CompareIED.ts +++ b/packages/plugins/src/menu/CompareIED.ts @@ -18,7 +18,7 @@ import { Dialog } from '@material/mwc-dialog'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { List } from '@material/mwc-list'; -import '@openscd/open-scd/src/plain-compare-list.js'; +import '@compas-oscd/open-scd'; import { compareNames, @@ -26,9 +26,9 @@ import { getNameAttribute, identity, isPublic, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js'; -import { DiffFilter } from '@openscd/open-scd/src/foundation/compare.js'; +import { DiffFilter } from '@compas-oscd/open-scd'; const tctrClass = `LN[lnClass='TCTR']`; const tvtrClass = `LN[lnClass='TVTR']`; diff --git a/packages/plugins/src/menu/Help.ts b/packages/plugins/src/menu/Help.ts index 664b4c1ca0..e40fd0a9f6 100644 --- a/packages/plugins/src/menu/Help.ts +++ b/packages/plugins/src/menu/Help.ts @@ -4,13 +4,14 @@ import * as marked from 'marked'; import '@material/mwc-icon'; -import '@openscd/open-scd/src/finder-list.js'; -import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js'; -import { openSCDIcon } from '@openscd/open-scd/src/icons/icons.js'; -import { Directory } from '@openscd/open-scd/src/finder-list.js'; +import '@compas-oscd/open-scd'; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; +import { openSCDIcon } from '@compas-oscd/open-scd'; +import { Directory } from '@compas-oscd/open-scd'; -const GITHUB_WIKI_LINK_PATTERN = /https:\/\/github\.com\/openscd\/open-scd\/wiki\/([^)]*)/g; -const MD_LINK_TITLE_PATTERN ='([^\\]]*)'; +const GITHUB_WIKI_LINK_PATTERN = + /https:\/\/github\.com\/openscd\/open-scd\/wiki\/([^)]*)/g; +const MD_LINK_TITLE_PATTERN = '([^\\]]*)'; const HYPHEN_PATTERN = /-/g; function aboutBox(version: string) { @@ -49,9 +50,12 @@ async function getLinkedPages(path: string[]): Promise { const page = path[path.length - 1].replace(/ /g, '-'); const res = await fetch(`/openscd/public/md/${page}.md`); const md = await res.text(); - const MD_LINK_REPLACEMENT = `$1` + const MD_LINK_REPLACEMENT = `$1`; const unlinkedMd = md.replace( - new RegExp(`\\[${MD_LINK_TITLE_PATTERN}\\]\\(${GITHUB_WIKI_LINK_PATTERN.source}\\)`, 'g'), + new RegExp( + `\\[${MD_LINK_TITLE_PATTERN}\\]\\(${GITHUB_WIKI_LINK_PATTERN.source}\\)`, + 'g' + ), MD_LINK_REPLACEMENT ); @@ -60,8 +64,7 @@ async function getLinkedPages(path: string[]): Promise { ${unsafeHTML(marked.parse(unlinkedMd))} `; const entries = Array.from( - md.matchAll( new RegExp(`\\(${GITHUB_WIKI_LINK_PATTERN.source}\\)`, 'g')) - + md.matchAll(new RegExp(`\\(${GITHUB_WIKI_LINK_PATTERN.source}\\)`, 'g')) ).map(([_, child]) => child.replace(HYPHEN_PATTERN, ' ')); return { path, header, entries }; diff --git a/packages/plugins/src/menu/ImportIEDs.ts b/packages/plugins/src/menu/ImportIEDs.ts index 29999af968..6316f77c7e 100644 --- a/packages/plugins/src/menu/ImportIEDs.ts +++ b/packages/plugins/src/menu/ImportIEDs.ts @@ -16,8 +16,8 @@ import { Dialog } from '@material/mwc-dialog'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/filtered-list.js'; -import { find, identity, isPublic } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd'; +import { find, identity, isPublic } from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; @@ -431,7 +431,11 @@ export default class ImportingIedPlugin extends LitElement { element: ied, }, }; - const actions = [ ...communicationActions, insertIed, ...dataTypeTemplateActions ]; + const actions = [ + ...communicationActions, + insertIed, + ...dataTypeTemplateActions, + ]; this.dispatchEvent( newActionEvent({ diff --git a/packages/plugins/src/menu/Merge.ts b/packages/plugins/src/menu/Merge.ts index c898c7ff5f..ce433d606f 100644 --- a/packages/plugins/src/menu/Merge.ts +++ b/packages/plugins/src/menu/Merge.ts @@ -1,7 +1,7 @@ import { css, html, LitElement, query, TemplateResult } from 'lit-element'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; -import { mergeWizard } from '@openscd/open-scd/src/wizards.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; +import { mergeWizard } from '@compas-oscd/open-scd'; export default class MergePlugin extends LitElement { doc!: XMLDocument; diff --git a/packages/plugins/src/menu/NewProject.ts b/packages/plugins/src/menu/NewProject.ts index 042d1dd963..ba301c7df5 100644 --- a/packages/plugins/src/menu/NewProject.ts +++ b/packages/plugins/src/menu/NewProject.ts @@ -5,35 +5,30 @@ import '@material/mwc-list'; import '@material/mwc-list/mwc-radio-list-item'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { newWizardEvent, Wizard, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js'; -import { - newEmptySCD, - SupportedVersion, -} from '@openscd/open-scd/src/schemas.js'; +import { newEmptySCD, SupportedVersion } from '@compas-oscd/open-scd'; export default class NewProjectPlugin extends LitElement { - private createNewProject( inputs: WizardInputElement[], wizard: Element ): EditorAction[] { + let docName = inputs[0].value ?? ''; - let docName = inputs[0].value ?? '' - - const acceptedFileExtension = ['.ssd', '.scd','.fsd']; - const isValidFileFormat = acceptedFileExtension.some((extension) => { + const acceptedFileExtension = ['.ssd', '.scd', '.fsd']; + const isValidFileFormat = acceptedFileExtension.some(extension => { return inputs[0].value?.endsWith(extension); - }) + }); - if(!isValidFileFormat) { + if (!isValidFileFormat) { docName = docName + '.scd'; } diff --git a/packages/plugins/src/menu/SubscriberInfo.ts b/packages/plugins/src/menu/SubscriberInfo.ts index e500a3fcc3..e1e254ba1b 100644 --- a/packages/plugins/src/menu/SubscriberInfo.ts +++ b/packages/plugins/src/menu/SubscriberInfo.ts @@ -1,6 +1,6 @@ import { LitElement } from 'lit-element'; import { get } from 'lit-translate'; -import { getVersion } from '@openscd/open-scd/src/foundation.js'; +import { getVersion } from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/menu/UpdateDescriptionABB.ts b/packages/plugins/src/menu/UpdateDescriptionABB.ts index a67c56617a..8a66b1eb6b 100644 --- a/packages/plugins/src/menu/UpdateDescriptionABB.ts +++ b/packages/plugins/src/menu/UpdateDescriptionABB.ts @@ -5,7 +5,7 @@ import '@material/mwc-list/mwc-check-list-item'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { find, identity, @@ -16,7 +16,7 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/menu/UpdateDescriptionSEL.ts b/packages/plugins/src/menu/UpdateDescriptionSEL.ts index 374476b716..c72054c2f0 100644 --- a/packages/plugins/src/menu/UpdateDescriptionSEL.ts +++ b/packages/plugins/src/menu/UpdateDescriptionSEL.ts @@ -5,7 +5,7 @@ import '@material/mwc-list/mwc-check-list-item'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { find, identity, @@ -16,7 +16,7 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/menu/UpdateSubstation.ts b/packages/plugins/src/menu/UpdateSubstation.ts index ec080f8bd4..10d2ee0c7c 100644 --- a/packages/plugins/src/menu/UpdateSubstation.ts +++ b/packages/plugins/src/menu/UpdateSubstation.ts @@ -8,8 +8,8 @@ import { newWizardEvent, SCLTag, tags, -} from '@openscd/open-scd/src/foundation.js'; -import { Diff, mergeWizard } from '@openscd/open-scd/src/wizards.js'; +} from '@compas-oscd/open-scd'; +import { Diff, mergeWizard } from '@compas-oscd/open-scd'; export function isValidReference( doc: XMLDocument, diff --git a/packages/plugins/src/menu/VirtualTemplateIED.ts b/packages/plugins/src/menu/VirtualTemplateIED.ts index 077e567f48..1f60696d74 100644 --- a/packages/plugins/src/menu/VirtualTemplateIED.ts +++ b/packages/plugins/src/menu/VirtualTemplateIED.ts @@ -19,12 +19,12 @@ import { Dialog } from '@material/mwc-dialog'; import { CheckListItem } from '@material/mwc-list/mwc-check-list-item'; import { Select } from '@material/mwc-select'; -import '@openscd/open-scd/src/filtered-list.js'; -import { find, identity } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd'; +import { find, identity } from '@compas-oscd/open-scd'; import { getChildElementsByTagName } from '@openscd/xml'; import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { getFunctionNamingPrefix, getNonLeafParent, diff --git a/packages/plugins/src/menu/virtualtemplateied/foundation.ts b/packages/plugins/src/menu/virtualtemplateied/foundation.ts index f1dbacb289..51c4da720c 100644 --- a/packages/plugins/src/menu/virtualtemplateied/foundation.ts +++ b/packages/plugins/src/menu/virtualtemplateied/foundation.ts @@ -1,11 +1,6 @@ -import { - identity, -} from '@openscd/open-scd/src/foundation.js'; - -import { - createElement, - getChildElementsByTagName, -} from '@openscd/xml'; +import { identity } from '@compas-oscd/open-scd'; + +import { createElement, getChildElementsByTagName } from '@openscd/xml'; const functionTypeElementTags = [ 'Function', diff --git a/packages/plugins/src/validators/ValidateSchema.ts b/packages/plugins/src/validators/ValidateSchema.ts index f87db58f2a..0736fc1355 100644 --- a/packages/plugins/src/validators/ValidateSchema.ts +++ b/packages/plugins/src/validators/ValidateSchema.ts @@ -14,7 +14,7 @@ import { ValidationResult, Validator, WorkerMessage, -} from '@openscd/open-scd/src/schemas.js'; +} from '@compas-oscd/open-scd'; const validators: Partial> = {}; diff --git a/packages/plugins/src/validators/templates/dabda.ts b/packages/plugins/src/validators/templates/dabda.ts index 260785f99c..796864d138 100644 --- a/packages/plugins/src/validators/templates/dabda.ts +++ b/packages/plugins/src/validators/templates/dabda.ts @@ -1,6 +1,6 @@ import { get } from 'lit-translate'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { LogDetailBase } from '@openscd/core/foundation/deprecated/history.js'; import { getTypeChild, isTypeMissing } from './foundation.js'; diff --git a/packages/plugins/src/validators/templates/datype.ts b/packages/plugins/src/validators/templates/datype.ts index 1a9e701310..adc3c8a9d9 100644 --- a/packages/plugins/src/validators/templates/datype.ts +++ b/packages/plugins/src/validators/templates/datype.ts @@ -1,8 +1,8 @@ import { get } from 'lit-translate'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { LogDetailBase } from '@openscd/core/foundation/deprecated/history.js'; import { validateChildren } from './foundation.js'; -import { iec6185073, iec6185081 } from '@openscd/open-scd/src/foundation/nsd.js'; +import { iec6185073, iec6185081 } from '@compas-oscd/open-scd'; async function getChildren( cdc: string | null | undefined, diff --git a/packages/plugins/src/validators/templates/dosdo.ts b/packages/plugins/src/validators/templates/dosdo.ts index ee8d4ed2b0..58221f7be4 100644 --- a/packages/plugins/src/validators/templates/dosdo.ts +++ b/packages/plugins/src/validators/templates/dosdo.ts @@ -1,5 +1,5 @@ import { get } from 'lit-translate'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { LogDetailBase } from '@openscd/core/foundation/deprecated/history.js'; import { getTypeChild, isTypeMissing } from './foundation.js'; diff --git a/packages/plugins/src/validators/templates/dotype.ts b/packages/plugins/src/validators/templates/dotype.ts index af1b8411d4..efda09eb45 100644 --- a/packages/plugins/src/validators/templates/dotype.ts +++ b/packages/plugins/src/validators/templates/dotype.ts @@ -1,16 +1,9 @@ import { get } from 'lit-translate'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { LogDetailBase } from '@openscd/core/foundation/deprecated/history.js'; -import { - getAdjacentClass, - validateChildren, -} from './foundation.js'; -import { - iec6185073, - iec6185074, - iec6185081, -} from '@openscd/open-scd/src/foundation/nsd.js'; +import { getAdjacentClass, validateChildren } from './foundation.js'; +import { iec6185073, iec6185074, iec6185081 } from '@compas-oscd/open-scd'; async function getSpecificDataObject( lnClass: string | null | undefined, diff --git a/packages/plugins/src/validators/templates/lnodetype.ts b/packages/plugins/src/validators/templates/lnodetype.ts index 62d0933cd1..b1fca228c5 100644 --- a/packages/plugins/src/validators/templates/lnodetype.ts +++ b/packages/plugins/src/validators/templates/lnodetype.ts @@ -1,11 +1,8 @@ import { get } from 'lit-translate'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { LogDetailBase } from '@openscd/core/foundation/deprecated/history.js'; -import { - getAdjacentClass, - validateChildren, -} from './foundation.js'; -import { iec6185074 } from '@openscd/open-scd/src/foundation/nsd.js'; +import { getAdjacentClass, validateChildren } from './foundation.js'; +import { iec6185074 } from '@compas-oscd/open-scd'; async function getMandatoryDataObject(base: string): Promise { const lnodeclasses = getAdjacentClass(await iec6185074, base); diff --git a/packages/plugins/src/wizards/abstractda.ts b/packages/plugins/src/wizards/abstractda.ts index 0658a9fa17..09a0a63cd2 100644 --- a/packages/plugins/src/wizards/abstractda.ts +++ b/packages/plugins/src/wizards/abstractda.ts @@ -6,15 +6,13 @@ import { ListItem } from '@material/mwc-list/mwc-list-item'; import { SelectedEvent } from '@material/mwc-list/mwc-list-foundation'; import { Select } from '@material/mwc-select'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import { - createElement, -} from '@openscd/xml'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import { createElement } from '@openscd/xml'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { maxLength, patterns } from './foundation/limits.js'; import { predefinedBasicTypeEnum, valKindEnum } from './foundation/enums.js'; diff --git a/packages/plugins/src/wizards/accesspoint.ts b/packages/plugins/src/wizards/accesspoint.ts index 356a99ea8c..86e3ba4608 100644 --- a/packages/plugins/src/wizards/accesspoint.ts +++ b/packages/plugins/src/wizards/accesspoint.ts @@ -1,7 +1,7 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { newWizardEvent, Wizard, @@ -9,7 +9,7 @@ import { WizardActor, isPublic, identity, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { Delete, ComplexAction, diff --git a/packages/plugins/src/wizards/address.ts b/packages/plugins/src/wizards/address.ts index 04c79abbf0..8adcdba817 100644 --- a/packages/plugins/src/wizards/address.ts +++ b/packages/plugins/src/wizards/address.ts @@ -5,10 +5,8 @@ import { get } from 'lit-translate'; import '@material/mwc-checkbox'; import '@material/mwc-formfield'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import { - createElement, -} from '@openscd/xml'; +import '@compas-oscd/open-scd'; +import { createElement } from '@openscd/xml'; import { Create, Delete } from '@openscd/core/foundation/deprecated/editor.js'; import { typeNullable, typePattern } from './foundation/p-types.js'; diff --git a/packages/plugins/src/wizards/bay.ts b/packages/plugins/src/wizards/bay.ts index ef7d425841..19917f025e 100644 --- a/packages/plugins/src/wizards/bay.ts +++ b/packages/plugins/src/wizards/bay.ts @@ -1,17 +1,15 @@ import { html, TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; import { replaceNamingAttributeWithReferencesAction } from './foundation/actions.js'; diff --git a/packages/plugins/src/wizards/bda.ts b/packages/plugins/src/wizards/bda.ts index 8185787b36..ccd1eb14f1 100644 --- a/packages/plugins/src/wizards/bda.ts +++ b/packages/plugins/src/wizards/bda.ts @@ -10,14 +10,14 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - cloneElement, - createElement, -} from '@openscd/xml'; +import { cloneElement, createElement } from '@openscd/xml'; -import { EditorAction, newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; +import { + EditorAction, + newActionEvent, +} from '@openscd/core/foundation/deprecated/editor.js'; import { getValAction, wizardContent } from './abstractda.js'; function remove(element: Element): WizardMenuActor { diff --git a/packages/plugins/src/wizards/clientln.ts b/packages/plugins/src/wizards/clientln.ts index ba26153c7d..3ad2b2b1a0 100644 --- a/packages/plugins/src/wizards/clientln.ts +++ b/packages/plugins/src/wizards/clientln.ts @@ -6,7 +6,7 @@ import '@material/mwc-icon'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { find, identity, @@ -15,13 +15,11 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; -import { clientIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { clientIcon } from '@compas-oscd/open-scd'; import { openCommunicationMappingWizard } from './commmap-wizards.js'; function getPath(identity: string | number): string { diff --git a/packages/plugins/src/wizards/commmap-wizards.ts b/packages/plugins/src/wizards/commmap-wizards.ts index cb5b34a809..b4c990eb5e 100644 --- a/packages/plugins/src/wizards/commmap-wizards.ts +++ b/packages/plugins/src/wizards/commmap-wizards.ts @@ -5,7 +5,7 @@ import '@material/mwc-icon'; import '@material/mwc-list/mwc-list-item'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { find, findControlBlocks, @@ -14,10 +14,10 @@ import { newWizardEvent, Wizard, WizardActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { selectClientLNsWizard } from './clientln.js'; import { selectExtRefsWizard } from './controlwithiedname.js'; -import { controlBlockIcons } from '@openscd/open-scd/src/icons/icons.js'; +import { controlBlockIcons } from '@compas-oscd/open-scd'; export function openCommunicationMappingWizard( root: XMLDocument | Element diff --git a/packages/plugins/src/wizards/conductingequipment.ts b/packages/plugins/src/wizards/conductingequipment.ts index 462d2b7b37..a0b8660e02 100644 --- a/packages/plugins/src/wizards/conductingequipment.ts +++ b/packages/plugins/src/wizards/conductingequipment.ts @@ -4,7 +4,7 @@ import { get } from 'lit-translate'; import '@material/mwc-list/mwc-list-item'; import '@material/mwc-select'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { crossProduct, getValue, @@ -12,11 +12,9 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; import { replaceNamingAction } from './foundation/actions.js'; diff --git a/packages/plugins/src/wizards/connectedap.ts b/packages/plugins/src/wizards/connectedap.ts index dbb1266f96..de93bdb00c 100644 --- a/packages/plugins/src/wizards/connectedap.ts +++ b/packages/plugins/src/wizards/connectedap.ts @@ -11,8 +11,8 @@ import { Checkbox } from '@material/mwc-checkbox'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { Wizard, WizardActor, @@ -21,11 +21,9 @@ import { getValue, isPublic, identity, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; import { EditorAction, @@ -38,10 +36,7 @@ import { typeNullable, typePattern, } from './foundation/p-types.js'; -import { - mACAddressGenerator, - appIdGenerator, -} from '@openscd/open-scd/src/foundation/generators.js'; +import { mACAddressGenerator, appIdGenerator } from '@compas-oscd/open-scd'; interface AccessPointDescription { element: Element; diff --git a/packages/plugins/src/wizards/connectivitynode.ts b/packages/plugins/src/wizards/connectivitynode.ts index 58b6f12701..82ccbea88e 100644 --- a/packages/plugins/src/wizards/connectivitynode.ts +++ b/packages/plugins/src/wizards/connectivitynode.ts @@ -1,7 +1,7 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; -import { isPublic, Wizard } from '@openscd/open-scd/src/foundation.js'; +import { isPublic, Wizard } from '@compas-oscd/open-scd'; function render( name: string | null, diff --git a/packages/plugins/src/wizards/controlwithiedname.ts b/packages/plugins/src/wizards/controlwithiedname.ts index 9b04d00e3e..9e74a247f3 100644 --- a/packages/plugins/src/wizards/controlwithiedname.ts +++ b/packages/plugins/src/wizards/controlwithiedname.ts @@ -6,7 +6,7 @@ import '@material/mwc-list'; import '@material/mwc-list/mwc-check-list-item'; import { List } from '@material/mwc-list'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { findControlBlocks, identity, @@ -14,12 +14,12 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; -import { inputIcon } from '@openscd/open-scd/src/icons/icons.js'; +import { inputIcon } from '@compas-oscd/open-scd'; import { getSourceReferences, openCommunicationMappingWizard, diff --git a/packages/plugins/src/wizards/da.ts b/packages/plugins/src/wizards/da.ts index d27cdec35e..2a0a0e6fdc 100644 --- a/packages/plugins/src/wizards/da.ts +++ b/packages/plugins/src/wizards/da.ts @@ -4,8 +4,8 @@ import { get } from 'lit-translate'; import '@material/mwc-button'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { getValue, isPublic, @@ -14,14 +14,14 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - cloneElement, - createElement, -} from '@openscd/xml'; +import { cloneElement, createElement } from '@openscd/xml'; -import { EditorAction, newActionEvent } from '@openscd/core/foundation/deprecated/editor.js'; +import { + EditorAction, + newActionEvent, +} from '@openscd/core/foundation/deprecated/editor.js'; import { getValAction, wizardContent } from './abstractda.js'; import { functionalConstraintEnum } from './foundation/enums.js'; diff --git a/packages/plugins/src/wizards/dai.ts b/packages/plugins/src/wizards/dai.ts index 4ef973308b..2da40ca1fe 100644 --- a/packages/plugins/src/wizards/dai.ts +++ b/packages/plugins/src/wizards/dai.ts @@ -4,15 +4,14 @@ import { get } from 'lit-translate'; import { DaiFieldTypes, getCustomField } from './foundation/dai-field-type.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; +import { Wizard, WizardActor, WizardInputElement } from '@compas-oscd/open-scd'; import { - Wizard, - WizardActor, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { EditorAction, ComplexAction } from '@openscd/core/foundation/deprecated/editor.js'; -import { SCL_NAMESPACE } from '@openscd/open-scd/src/schemas.js'; + EditorAction, + ComplexAction, +} from '@openscd/core/foundation/deprecated/editor.js'; +import { SCL_NAMESPACE } from '@compas-oscd/open-scd'; export function updateValue(element: Element, val: Element): WizardActor { return (inputs: WizardInputElement[]): EditorAction[] => { diff --git a/packages/plugins/src/wizards/dataset.ts b/packages/plugins/src/wizards/dataset.ts index b837c8cbab..b93113f4a4 100644 --- a/packages/plugins/src/wizards/dataset.ts +++ b/packages/plugins/src/wizards/dataset.ts @@ -5,8 +5,8 @@ import { get } from 'lit-translate'; import '@material/mwc-button'; import '@material/mwc-list/mwc-check-list-item'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -17,7 +17,7 @@ import { WizardInputElement, WizardMenuActor, newSubWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/eqfunction.ts b/packages/plugins/src/wizards/eqfunction.ts index 926550f500..b7bd68a409 100644 --- a/packages/plugins/src/wizards/eqfunction.ts +++ b/packages/plugins/src/wizards/eqfunction.ts @@ -5,7 +5,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, diff --git a/packages/plugins/src/wizards/eqsubfunction.ts b/packages/plugins/src/wizards/eqsubfunction.ts index d16b509ddc..63ad698402 100644 --- a/packages/plugins/src/wizards/eqsubfunction.ts +++ b/packages/plugins/src/wizards/eqsubfunction.ts @@ -5,7 +5,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, diff --git a/packages/plugins/src/wizards/fcda.ts b/packages/plugins/src/wizards/fcda.ts index 72c45636c2..9eceaa9280 100644 --- a/packages/plugins/src/wizards/fcda.ts +++ b/packages/plugins/src/wizards/fcda.ts @@ -7,13 +7,11 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; import { dataAttributePicker, getDataModelChildren, diff --git a/packages/plugins/src/wizards/foundation/actions.ts b/packages/plugins/src/wizards/foundation/actions.ts index 3cc95f8b63..3405756c5c 100644 --- a/packages/plugins/src/wizards/foundation/actions.ts +++ b/packages/plugins/src/wizards/foundation/actions.ts @@ -2,7 +2,7 @@ import { getValue, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/foundation/dai-field-type.ts b/packages/plugins/src/wizards/foundation/dai-field-type.ts index efdc46f4dd..fe41d27b6f 100644 --- a/packages/plugins/src/wizards/foundation/dai-field-type.ts +++ b/packages/plugins/src/wizards/foundation/dai-field-type.ts @@ -3,13 +3,10 @@ import { get } from 'lit-translate'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; -import { - getValue, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { getValue, WizardInputElement } from '@compas-oscd/open-scd'; export interface CustomField { render( diff --git a/packages/plugins/src/wizards/foundation/finder.ts b/packages/plugins/src/wizards/foundation/finder.ts index 5edc4bacb1..67094315da 100644 --- a/packages/plugins/src/wizards/foundation/finder.ts +++ b/packages/plugins/src/wizards/foundation/finder.ts @@ -1,9 +1,9 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/finder-list.js'; -import { Directory } from '@openscd/open-scd/src/finder-list.js'; -import { find, identity, isPublic } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd'; +import { Directory } from '@compas-oscd/open-scd'; +import { find, identity, isPublic } from '@compas-oscd/open-scd'; export function getDisplayString(entry: string): string { if (entry.startsWith('IED:')) return entry.replace(/^.*:/, '').trim(); diff --git a/packages/plugins/src/wizards/foundation/references.ts b/packages/plugins/src/wizards/foundation/references.ts index 7893ac9521..a4f5fdae80 100644 --- a/packages/plugins/src/wizards/foundation/references.ts +++ b/packages/plugins/src/wizards/foundation/references.ts @@ -1,7 +1,4 @@ -import { - getNameAttribute, - isPublic, -} from '@openscd/open-scd/src/foundation.js'; +import { getNameAttribute, isPublic } from '@compas-oscd/open-scd'; import { Delete, Replace } from '@openscd/core/foundation/deprecated/editor'; const referenceInfoTags = [ 'IED', diff --git a/packages/plugins/src/wizards/function.ts b/packages/plugins/src/wizards/function.ts index c065295ba2..77073abe34 100644 --- a/packages/plugins/src/wizards/function.ts +++ b/packages/plugins/src/wizards/function.ts @@ -6,12 +6,12 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, createElement, - getChildElementsByTagName + getChildElementsByTagName, } from '@openscd/xml'; import { SimpleAction } from '@openscd/core/foundation/deprecated/editor.js'; diff --git a/packages/plugins/src/wizards/generalEquipment.ts b/packages/plugins/src/wizards/generalEquipment.ts index 17afbb41fc..546b815e3e 100644 --- a/packages/plugins/src/wizards/generalEquipment.ts +++ b/packages/plugins/src/wizards/generalEquipment.ts @@ -5,7 +5,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, diff --git a/packages/plugins/src/wizards/gse.ts b/packages/plugins/src/wizards/gse.ts index 1586c36fe2..1da21ced6a 100644 --- a/packages/plugins/src/wizards/gse.ts +++ b/packages/plugins/src/wizards/gse.ts @@ -3,14 +3,14 @@ import { get } from 'lit-translate'; import { Checkbox } from '@material/mwc-checkbox'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, identity, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/gsecontrol.ts b/packages/plugins/src/wizards/gsecontrol.ts index 460d9b9f59..f50023b919 100644 --- a/packages/plugins/src/wizards/gsecontrol.ts +++ b/packages/plugins/src/wizards/gsecontrol.ts @@ -8,10 +8,10 @@ import { List } from '@material/mwc-list'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/filtered-list.js'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -24,7 +24,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, @@ -32,19 +32,19 @@ import { getUniqueElementName, } from '@openscd/xml'; -import { +import { ComplexAction, Delete, SimpleAction, EditorAction, - newActionEvent + newActionEvent, } from '@openscd/core/foundation/deprecated/editor.js'; import { maxLength, patterns } from './foundation/limits.js'; import { editDataSetWizard } from './dataset.js'; import { editGseWizard } from './gse.js'; import { securityEnabledEnum } from './foundation/enums.js'; import { dataAttributePicker, iEDPicker } from './foundation/finder.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; import { newFCDA } from './fcda.js'; import { getConnectedAP, diff --git a/packages/plugins/src/wizards/ied.ts b/packages/plugins/src/wizards/ied.ts index 56c5581b12..3e9a9eb5d2 100644 --- a/packages/plugins/src/wizards/ied.ts +++ b/packages/plugins/src/wizards/ied.ts @@ -4,7 +4,7 @@ import { get } from 'lit-translate'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { identity, isPublic, @@ -14,7 +14,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { ComplexAction, Delete, @@ -25,7 +25,7 @@ import { patterns } from './foundation/limits.js'; import { updateNamingAttributeWithReferencesAction } from './foundation/actions.js'; import { deleteReferences } from './foundation/references.js'; -import { emptyInputsDeleteActions } from '@openscd/open-scd/src/foundation/ied.js'; +import { emptyInputsDeleteActions } from '@compas-oscd/open-scd'; const iedNamePattern = '[A-Za-z][0-9A-Za-z_]{0,2}|' + diff --git a/packages/plugins/src/wizards/ldevice.ts b/packages/plugins/src/wizards/ldevice.ts index 7dc19450cb..708d8efaa8 100644 --- a/packages/plugins/src/wizards/ldevice.ts +++ b/packages/plugins/src/wizards/ldevice.ts @@ -4,13 +4,13 @@ import { get } from 'lit-translate'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/line.ts b/packages/plugins/src/wizards/line.ts index e1670a6ba9..b15774db48 100644 --- a/packages/plugins/src/wizards/line.ts +++ b/packages/plugins/src/wizards/line.ts @@ -1,14 +1,14 @@ import { html, TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, patterns, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, createElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/ln.ts b/packages/plugins/src/wizards/ln.ts index 59722af218..50c79b90fd 100644 --- a/packages/plugins/src/wizards/ln.ts +++ b/packages/plugins/src/wizards/ln.ts @@ -1,13 +1,13 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/ln0.ts b/packages/plugins/src/wizards/ln0.ts index 1a77faa076..a90052ede8 100644 --- a/packages/plugins/src/wizards/ln0.ts +++ b/packages/plugins/src/wizards/ln0.ts @@ -2,14 +2,14 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; diff --git a/packages/plugins/src/wizards/lnode.ts b/packages/plugins/src/wizards/lnode.ts index 956abf3e0e..66ae205b6a 100644 --- a/packages/plugins/src/wizards/lnode.ts +++ b/packages/plugins/src/wizards/lnode.ts @@ -9,7 +9,7 @@ import { ListBase } from '@material/mwc-list/mwc-list-base'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -22,7 +22,7 @@ import { WizardInputElement, WizardMenuActor, newLnInstGenerator, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, diff --git a/packages/plugins/src/wizards/optfields.ts b/packages/plugins/src/wizards/optfields.ts index e531a0ff04..198b34a10a 100644 --- a/packages/plugins/src/wizards/optfields.ts +++ b/packages/plugins/src/wizards/optfields.ts @@ -3,19 +3,17 @@ import { get } from 'lit-translate'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - cloneElement, -} from '@openscd/xml'; +import { cloneElement } from '@openscd/xml'; interface ContentOptions { seqNum: string | null; diff --git a/packages/plugins/src/wizards/powertransformer.ts b/packages/plugins/src/wizards/powertransformer.ts index cd7fb4def1..97e970ccd9 100644 --- a/packages/plugins/src/wizards/powertransformer.ts +++ b/packages/plugins/src/wizards/powertransformer.ts @@ -7,11 +7,9 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; -import { - createElement, -} from '@openscd/xml'; +import { createElement } from '@openscd/xml'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor.js'; diff --git a/packages/plugins/src/wizards/process.ts b/packages/plugins/src/wizards/process.ts index 203e6d20ab..68795367a3 100644 --- a/packages/plugins/src/wizards/process.ts +++ b/packages/plugins/src/wizards/process.ts @@ -6,7 +6,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, diff --git a/packages/plugins/src/wizards/reportcontrol.ts b/packages/plugins/src/wizards/reportcontrol.ts index ed11960612..f814177199 100644 --- a/packages/plugins/src/wizards/reportcontrol.ts +++ b/packages/plugins/src/wizards/reportcontrol.ts @@ -8,10 +8,10 @@ import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; -import '@openscd/open-scd/src/filtered-list.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { find, getReference, @@ -25,7 +25,7 @@ import { WizardMenuActor, MenuAction, newWizardEvent, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, @@ -40,15 +40,15 @@ import { ComplexAction, newActionEvent, } from '@openscd/core/foundation/deprecated/editor.js'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { FinderList } from '@compas-oscd/open-scd'; import { dataAttributePicker, iEDPicker } from './foundation/finder.js'; import { maxLength, patterns } from './foundation/limits.js'; import { editDataSetWizard } from './dataset.js'; import { newFCDA } from './fcda.js'; import { contentOptFieldsWizard, editOptFieldsWizard } from './optfields.js'; import { contentTrgOpsWizard, editTrgOpsWizard } from './trgops.js'; -import { existFcdaReference } from '@openscd/open-scd/src/foundation/scl.js'; +import { existFcdaReference } from '@compas-oscd/open-scd'; interface ContentOptions { name: string | null; diff --git a/packages/plugins/src/wizards/sampledvaluecontrol.ts b/packages/plugins/src/wizards/sampledvaluecontrol.ts index 116daf86aa..47356b5612 100644 --- a/packages/plugins/src/wizards/sampledvaluecontrol.ts +++ b/packages/plugins/src/wizards/sampledvaluecontrol.ts @@ -7,10 +7,10 @@ import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation'; -import '@openscd/open-scd/src/filtered-list.js'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { find, getValue, @@ -23,7 +23,7 @@ import { WizardActor, WizardInputElement, WizardMenuActor, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { cloneElement, @@ -43,7 +43,7 @@ import { editSMvWizard } from './smv.js'; import { contentSmvOptsWizard, editSmvOptsWizard } from './smvopts.js'; import { editDataSetWizard } from './dataset.js'; import { iEDPicker, sampledValueDataPicker } from './foundation/finder.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; import { getConnectedAP, isAccessPointConnected, diff --git a/packages/plugins/src/wizards/service-GSEControl.ts b/packages/plugins/src/wizards/service-GSEControl.ts index 3116816e83..be59690e0c 100644 --- a/packages/plugins/src/wizards/service-GSEControl.ts +++ b/packages/plugins/src/wizards/service-GSEControl.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/service-clientServer-configurations.ts b/packages/plugins/src/wizards/service-clientServer-configurations.ts index 67a02bd6e6..20edc27415 100644 --- a/packages/plugins/src/wizards/service-clientServer-configurations.ts +++ b/packages/plugins/src/wizards/service-clientServer-configurations.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/service-log-settingsgroup.ts b/packages/plugins/src/wizards/service-log-settingsgroup.ts index 90c1cfd1e8..537ae76e85 100644 --- a/packages/plugins/src/wizards/service-log-settingsgroup.ts +++ b/packages/plugins/src/wizards/service-log-settingsgroup.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/service-networking.ts b/packages/plugins/src/wizards/service-networking.ts index 30b7ea5360..f23aad96b8 100644 --- a/packages/plugins/src/wizards/service-networking.ts +++ b/packages/plugins/src/wizards/service-networking.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/service-report-configurations.ts b/packages/plugins/src/wizards/service-report-configurations.ts index 8b6d7e5d0b..1032557952 100644 --- a/packages/plugins/src/wizards/service-report-configurations.ts +++ b/packages/plugins/src/wizards/service-report-configurations.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/service-sampled-values.ts b/packages/plugins/src/wizards/service-sampled-values.ts index 9591d06584..241a93d730 100644 --- a/packages/plugins/src/wizards/service-sampled-values.ts +++ b/packages/plugins/src/wizards/service-sampled-values.ts @@ -1,6 +1,6 @@ import { TemplateResult } from 'lit-html'; import { get } from 'lit-translate'; -import { WizardPage } from '@openscd/open-scd/src/foundation.js'; +import { WizardPage } from '@compas-oscd/open-scd'; import { createFormDivider, diff --git a/packages/plugins/src/wizards/services.ts b/packages/plugins/src/wizards/services.ts index a9a0248e22..cb881a5792 100644 --- a/packages/plugins/src/wizards/services.ts +++ b/packages/plugins/src/wizards/services.ts @@ -1,8 +1,8 @@ import { html, TemplateResult } from 'lit-html'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; -import { Wizard, WizardInput } from '@openscd/open-scd/src/foundation.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; +import { Wizard, WizardInput } from '@compas-oscd/open-scd'; import { createLogSettingsGroupServicesWizardPage } from './service-log-settingsgroup.js'; import { createReportConfigurationsWizardPage } from './service-report-configurations.js'; import { createGSEControlWizardPage } from './service-GSEControl.js'; diff --git a/packages/plugins/src/wizards/smv.ts b/packages/plugins/src/wizards/smv.ts index 2ca4d71900..3c5b459198 100644 --- a/packages/plugins/src/wizards/smv.ts +++ b/packages/plugins/src/wizards/smv.ts @@ -9,7 +9,7 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { ComplexAction } from '@openscd/core/foundation/deprecated/editor.js'; import { contentGseOrSmvWizard, updateAddress } from './address.js'; diff --git a/packages/plugins/src/wizards/smvopts.ts b/packages/plugins/src/wizards/smvopts.ts index 3564be921b..27ef3038d3 100644 --- a/packages/plugins/src/wizards/smvopts.ts +++ b/packages/plugins/src/wizards/smvopts.ts @@ -9,7 +9,7 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; interface ContentOptions { refreshTime: string | null; diff --git a/packages/plugins/src/wizards/subequipment.ts b/packages/plugins/src/wizards/subequipment.ts index d55f218526..96427f4b47 100644 --- a/packages/plugins/src/wizards/subequipment.ts +++ b/packages/plugins/src/wizards/subequipment.ts @@ -12,10 +12,10 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { SimpleAction } from '@openscd/core/foundation/deprecated/editor'; -import '@openscd/open-scd/src/wizard-textfield.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; interface ContentOptions { name: string | null; diff --git a/packages/plugins/src/wizards/subfunction.ts b/packages/plugins/src/wizards/subfunction.ts index c1d58196bf..70396f9c2a 100644 --- a/packages/plugins/src/wizards/subfunction.ts +++ b/packages/plugins/src/wizards/subfunction.ts @@ -11,7 +11,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { SimpleAction } from '@openscd/core/foundation/deprecated/editor'; import { contentFunctionWizard } from './function.js'; diff --git a/packages/plugins/src/wizards/subnetwork.ts b/packages/plugins/src/wizards/subnetwork.ts index 66b469ab1b..a6adbae379 100644 --- a/packages/plugins/src/wizards/subnetwork.ts +++ b/packages/plugins/src/wizards/subnetwork.ts @@ -3,7 +3,7 @@ import { get } from 'lit-translate'; import { cloneElement, createElement } from '@openscd/xml'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getMultiplier, getValue, @@ -11,7 +11,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { EditorAction } from '@openscd/core/foundation/deprecated/editor'; /** Initial attribute values suggested for `SubNetwork` creation */ diff --git a/packages/plugins/src/wizards/substation.ts b/packages/plugins/src/wizards/substation.ts index 7a6c7d6c1b..b099f017ee 100644 --- a/packages/plugins/src/wizards/substation.ts +++ b/packages/plugins/src/wizards/substation.ts @@ -6,14 +6,14 @@ import '@material/mwc-formfield'; import { createElement } from '@openscd/xml'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getValue, Wizard, WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { guessVoltageLevel } from '../editors/substation/guess-wizard.js'; import { updateNamingAttributeWithReferencesAction } from './foundation/actions.js'; diff --git a/packages/plugins/src/wizards/tapchanger.ts b/packages/plugins/src/wizards/tapchanger.ts index 5b9c98b1c8..114cc36df7 100644 --- a/packages/plugins/src/wizards/tapchanger.ts +++ b/packages/plugins/src/wizards/tapchanger.ts @@ -12,7 +12,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { SimpleAction } from '@openscd/core/foundation/deprecated/editor'; function createTapChangerAction(parent: Element): WizardActor { diff --git a/packages/plugins/src/wizards/terminal.ts b/packages/plugins/src/wizards/terminal.ts index e81297bd0c..dc3051ca17 100644 --- a/packages/plugins/src/wizards/terminal.ts +++ b/packages/plugins/src/wizards/terminal.ts @@ -1,7 +1,7 @@ import { html, TemplateResult } from 'lit-element'; import { get } from 'lit-translate'; -import { isPublic, Wizard } from '@openscd/open-scd/src/foundation.js'; +import { isPublic, Wizard } from '@compas-oscd/open-scd'; function render( name: string | null, diff --git a/packages/plugins/src/wizards/transformerWinding.ts b/packages/plugins/src/wizards/transformerWinding.ts index 0267fa20cb..b9b557ed47 100644 --- a/packages/plugins/src/wizards/transformerWinding.ts +++ b/packages/plugins/src/wizards/transformerWinding.ts @@ -12,7 +12,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { SimpleAction } from '@openscd/core/foundation/deprecated/editor'; function createTransformerWindingAction(parent: Element): WizardActor { diff --git a/packages/plugins/src/wizards/trgops.ts b/packages/plugins/src/wizards/trgops.ts index c102b022a9..5c626fa181 100644 --- a/packages/plugins/src/wizards/trgops.ts +++ b/packages/plugins/src/wizards/trgops.ts @@ -3,8 +3,8 @@ import { get } from 'lit-translate'; import '@material/mwc-list/mwc-list-item'; -import '@openscd/open-scd/src/wizard-checkbox.js'; -import '@openscd/open-scd/src/wizard-select.js'; +import '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { cloneElement } from '@openscd/xml'; @@ -14,7 +14,7 @@ import { WizardAction, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; interface ContentOptions { dchg: string | null; diff --git a/packages/plugins/src/wizards/voltagelevel.ts b/packages/plugins/src/wizards/voltagelevel.ts index 6ec1ceb2c3..e860d2bd14 100644 --- a/packages/plugins/src/wizards/voltagelevel.ts +++ b/packages/plugins/src/wizards/voltagelevel.ts @@ -3,7 +3,7 @@ import { get } from 'lit-translate'; import { cloneElement, createElement } from '@openscd/xml'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { getMultiplier, getValue, @@ -11,7 +11,7 @@ import { Wizard, WizardActor, WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +} from '@compas-oscd/open-scd'; import { ComplexAction, EditorAction, diff --git a/packages/plugins/src/wizards/wizard-library.ts b/packages/plugins/src/wizards/wizard-library.ts index 28b83b5bfb..0f33ce7b98 100644 --- a/packages/plugins/src/wizards/wizard-library.ts +++ b/packages/plugins/src/wizards/wizard-library.ts @@ -1,4 +1,4 @@ -import { SCLTag, Wizard } from '@openscd/open-scd/src/foundation.js'; +import { SCLTag, Wizard } from '@compas-oscd/open-scd'; import { createBayWizard, editBayWizard } from './bay.js'; import { diff --git a/packages/plugins/test/foundation.ts b/packages/plugins/test/foundation.ts index 28bd6cdaf4..8d49e8d089 100644 --- a/packages/plugins/test/foundation.ts +++ b/packages/plugins/test/foundation.ts @@ -1,7 +1,7 @@ /* eslint-disable no-control-regex */ import fc, { Arbitrary, array, hexaString, integer, tuple } from 'fast-check'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; +import { patterns } from '@compas-oscd/open-scd'; export function invertedRegex( re: RegExp, diff --git a/packages/plugins/test/integration/editors/GooseSubscriberDataBinding.test.ts b/packages/plugins/test/integration/editors/GooseSubscriberDataBinding.test.ts index 9b37555097..148dacc94c 100644 --- a/packages/plugins/test/integration/editors/GooseSubscriberDataBinding.test.ts +++ b/packages/plugins/test/integration/editors/GooseSubscriberDataBinding.test.ts @@ -1,15 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import GooseSubscriberDataBinding from '../../../src/editors/GooseSubscriberDataBinding.js'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import { getExtrefDataBindingList, getFCDABindingList, getSelectedSubItemValue, selectFCDAItem, } from './test-support.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { TemplateResult } from 'lit-html'; import { customElement, query } from 'lit-element'; diff --git a/packages/plugins/test/integration/editors/GooseSubscriberMessageBinding.test.ts b/packages/plugins/test/integration/editors/GooseSubscriberMessageBinding.test.ts index 5d65baafd7..fcadbb6e0a 100644 --- a/packages/plugins/test/integration/editors/GooseSubscriberMessageBinding.test.ts +++ b/packages/plugins/test/integration/editors/GooseSubscriberMessageBinding.test.ts @@ -1,12 +1,12 @@ import { expect, fixture } from '@open-wc/testing'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item.js'; import GooseSubscriberMessageBindingPlugin from '../../../src/editors/GooseSubscriberMessageBinding.js'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { customElement, query, TemplateResult, html } from 'lit-element'; import { SubscriberList } from '../../../src/editors/subscription/goose/subscriber-list.js'; diff --git a/packages/plugins/test/integration/editors/IED.test.ts b/packages/plugins/test/integration/editors/IED.test.ts index bad304d26a..a1fbfaa563 100644 --- a/packages/plugins/test/integration/editors/IED.test.ts +++ b/packages/plugins/test/integration/editors/IED.test.ts @@ -2,21 +2,18 @@ import { expect, fixture, html } from '@open-wc/testing'; import { LitElement } from 'lit-element'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import '../../../src/editors/IED.js'; -import { - initializeNsdoc, - Nsdoc, -} from '@openscd/open-scd/src/foundation/nsdoc.js'; -import { FilterButton } from '@openscd/open-scd/src/oscd-filter-button.js'; +import { initializeNsdoc, Nsdoc } from '@compas-oscd/open-scd'; +import { FilterButton } from '@compas-oscd/open-scd'; import IED from '../../../src/editors/IED.js'; import { LDeviceContainer } from '../../../src/editors/ied/ldevice-container.js'; import { LNContainer } from '../../../src/editors/ied/ln-container.js'; import { DOContainer } from '../../../src/editors/ied/do-container.js'; import { DAContainer } from '../../../src/editors/ied/da-container.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { OscdApi } from '@openscd/core'; import { PluginStateApi } from '../../../../core/dist/api/plugin-state-api.js'; diff --git a/packages/plugins/test/integration/editors/Protocol104.test.ts b/packages/plugins/test/integration/editors/Protocol104.test.ts index 8329ff9b56..b21eb5ee59 100644 --- a/packages/plugins/test/integration/editors/Protocol104.test.ts +++ b/packages/plugins/test/integration/editors/Protocol104.test.ts @@ -1,9 +1,9 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import Protocol104 from '../../../src/editors/Protocol104.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; describe('Protocol 104 Plugin', () => { customElements.define('protocol104-plugin', Protocol104); diff --git a/packages/plugins/test/integration/editors/SMVSubscriberDataBinding.test.ts b/packages/plugins/test/integration/editors/SMVSubscriberDataBinding.test.ts index 24b66f52c8..736d60a69b 100644 --- a/packages/plugins/test/integration/editors/SMVSubscriberDataBinding.test.ts +++ b/packages/plugins/test/integration/editors/SMVSubscriberDataBinding.test.ts @@ -1,5 +1,5 @@ import { expect, fixture } from '@open-wc/testing'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import SMVSubscriberDataBinding from '../../../src/editors/SMVSubscriberDataBinding.js'; @@ -10,8 +10,8 @@ import { selectFCDAItem, } from './test-support.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { customElement, query, TemplateResult, html } from 'lit-element'; diff --git a/packages/plugins/test/integration/editors/SMVSubscriberMessageBinding.test.ts b/packages/plugins/test/integration/editors/SMVSubscriberMessageBinding.test.ts index 66f684b401..32028b5061 100644 --- a/packages/plugins/test/integration/editors/SMVSubscriberMessageBinding.test.ts +++ b/packages/plugins/test/integration/editors/SMVSubscriberMessageBinding.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import SMVSubscriberMessageBindingPlugin from '../../../src/editors/SMVSubscriberMessageBinding.js'; import { ListItem } from '@material/mwc-list/mwc-list-item.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; +import '@compas-oscd/open-scd'; import { TemplateResult, customElement, query } from 'lit-element'; customElements.define('smv-plugin', SMVSubscriberMessageBindingPlugin); diff --git a/packages/plugins/test/integration/editors/Substation.test.ts b/packages/plugins/test/integration/editors/Substation.test.ts index 3ced0c3466..9f7d3e5cf8 100644 --- a/packages/plugins/test/integration/editors/Substation.test.ts +++ b/packages/plugins/test/integration/editors/Substation.test.ts @@ -1,9 +1,9 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import Substation from '../../../src/editors/Substation.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; describe('Substation Plugin', () => { customElements.define('substation-plugin', Substation); diff --git a/packages/plugins/test/integration/editors/cleanup/control-blocks-container.test.ts b/packages/plugins/test/integration/editors/cleanup/control-blocks-container.test.ts index c0609d79e1..4b810766f1 100644 --- a/packages/plugins/test/integration/editors/cleanup/control-blocks-container.test.ts +++ b/packages/plugins/test/integration/editors/cleanup/control-blocks-container.test.ts @@ -1,12 +1,12 @@ 'use strict'; import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import '../../../../src/editors/cleanup/control-blocks-container.js'; import { CleanupControlBlocks } from '../../../../src/editors/cleanup/control-blocks-container.js'; import { cleanSCLItems } from '../../../../src/editors/cleanup/foundation.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; describe('cleanup-editor integration: unreferenced control blocks', () => { let element: CleanupControlBlocks; diff --git a/packages/plugins/test/integration/editors/cleanup/datasets-container.test.ts b/packages/plugins/test/integration/editors/cleanup/datasets-container.test.ts index 67dec61999..3ac7415f45 100644 --- a/packages/plugins/test/integration/editors/cleanup/datasets-container.test.ts +++ b/packages/plugins/test/integration/editors/cleanup/datasets-container.test.ts @@ -1,8 +1,8 @@ 'use strict'; import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import '../../../../src/editors/cleanup/datasets-container.js'; import { CleanupDatasets } from '../../../../src/editors/cleanup/datasets-container.js'; diff --git a/packages/plugins/test/integration/editors/cleanup/datatypes-container.test.ts b/packages/plugins/test/integration/editors/cleanup/datatypes-container.test.ts index 8a655528f1..9a43c07128 100644 --- a/packages/plugins/test/integration/editors/cleanup/datatypes-container.test.ts +++ b/packages/plugins/test/integration/editors/cleanup/datatypes-container.test.ts @@ -1,8 +1,8 @@ 'use strict'; import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import '../../../../src/editors/cleanup/datatypes-container.js'; import { CleanupDataTypes } from '../../../../src/editors/cleanup/datatypes-container.js'; diff --git a/packages/plugins/test/integration/editors/communication/Communication.test.ts b/packages/plugins/test/integration/editors/communication/Communication.test.ts index f1a063aaec..8525e0ac7e 100644 --- a/packages/plugins/test/integration/editors/communication/Communication.test.ts +++ b/packages/plugins/test/integration/editors/communication/Communication.test.ts @@ -1,11 +1,11 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import Communication from '../../../../src/editors/Communication.js'; import { Dialog } from '@material/mwc-dialog'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; describe('Communication Plugin', () => { customElements.define('communication-plugin', Communication); diff --git a/packages/plugins/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts index be19c2c88b..5cf1e1723f 100644 --- a/packages/plugins/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/communication/connectedap-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/communication/connectedap-editor.js'; import { ConnectedAPEditor } from '../../../../src/editors/communication/connectedap-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('connectedap-editor wizarding editing integration', () => { describe('edit wizard', () => { diff --git a/packages/plugins/test/integration/editors/communication/gse-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/communication/gse-editor-wizarding-editing.test.ts index c69cd57ef6..9f91d2e220 100644 --- a/packages/plugins/test/integration/editors/communication/gse-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/communication/gse-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect, waitUntil } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/communication/gse-editor.js'; import { GseEditor } from '../../../../src/editors/communication/gse-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('gse-editor wizarding editing integration', () => { describe('edit wizard', () => { diff --git a/packages/plugins/test/integration/editors/communication/smv-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/communication/smv-editor-wizarding-editing.test.ts index afd96f39b7..c4c240531a 100644 --- a/packages/plugins/test/integration/editors/communication/smv-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/communication/smv-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/communication/smv-editor.js'; import { SmvEditor } from '../../../../src/editors/communication/smv-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('smv-editor wizarding editing integration', () => { describe('edit wizard', () => { diff --git a/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts index d3eea8ee93..d00cb26a60 100644 --- a/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding-editing.test.ts @@ -1,13 +1,13 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/communication/subnetwork-editor.js'; import { SubNetworkEditor } from '../../../../src/editors/communication/subnetwork-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('subnetwork-editor wizarding editing integration', () => { describe('edit wizard', () => { diff --git a/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts b/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts index 55ccbb9174..79a5baf2ed 100644 --- a/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/communication/subnetwork-editor-wizarding.test.ts @@ -1,8 +1,8 @@ import { fixture, html, expect } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../../src/editors/communication/subnetwork-editor.js'; import { regexString, regExp, inverseRegExp } from '../../../foundation.js'; diff --git a/packages/plugins/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts index 2e598ed5eb..301755c3a5 100644 --- a/packages/plugins/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts @@ -1,12 +1,12 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/bay-editor.js'; import { BayEditor } from '../../../../src/editors/substation/bay-editor.js'; import { Select } from '@material/mwc-select'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/bay-editor-wizarding.test.ts b/packages/plugins/test/integration/editors/substation/bay-editor-wizarding.test.ts index 6122dbefef..fc7c187530 100644 --- a/packages/plugins/test/integration/editors/substation/bay-editor-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/substation/bay-editor-wizarding.test.ts @@ -1,8 +1,8 @@ import { fixture, html, expect } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/bay-editor.js'; import { regExp, regexString } from '../../../foundation.js'; @@ -17,10 +17,9 @@ describe('bay-editor wizarding integration', () => { .then(str => new DOMParser().parseFromString(str, 'application/xml')); parent = await fixture( - html` - - - ` + html` + + ` ); (( @@ -64,5 +63,4 @@ describe('bay-editor wizarding integration', () => { ); }); }); - }); diff --git a/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts index 47548dac58..b7a31ad1ab 100644 --- a/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/conducting-equipment-editor.js'; import { ConductingEquipmentEditor } from '../../../../src/editors/substation/conducting-equipment-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts b/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts index 2e0fd5a6e6..7000a321b9 100644 --- a/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts @@ -1,8 +1,8 @@ import { fixture, html, expect } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/conducting-equipment-editor.js'; import { regexString, regExp } from '../../../foundation.js'; diff --git a/packages/plugins/test/integration/editors/substation/eq-function-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/eq-function-wizarding-editing.test.ts index 68218bffdf..afbb310505 100644 --- a/packages/plugins/test/integration/editors/substation/eq-function-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/eq-function-wizarding-editing.test.ts @@ -1,13 +1,13 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/eq-function-editor.js'; import { EqFunctionEditor } from '../../../../src/editors/substation/eq-function-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/eq-sub-function-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/eq-sub-function-editor-wizarding-editing.test.ts index b1037a380e..edc624b76f 100644 --- a/packages/plugins/test/integration/editors/substation/eq-sub-function-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/eq-sub-function-editor-wizarding-editing.test.ts @@ -1,13 +1,13 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/eq-sub-function-editor.js'; import { EqSubFunctionEditor } from '../../../../src/editors/substation/eq-sub-function-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/function-editor.test.ts b/packages/plugins/test/integration/editors/substation/function-editor.test.ts index 499712f241..753b214652 100644 --- a/packages/plugins/test/integration/editors/substation/function-editor.test.ts +++ b/packages/plugins/test/integration/editors/substation/function-editor.test.ts @@ -1,13 +1,13 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/function-editor.js'; import { FunctionEditor } from '../../../../src/editors/substation/function-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/general-equipment-editor-wizard-editing.test.ts b/packages/plugins/test/integration/editors/substation/general-equipment-editor-wizard-editing.test.ts index e13d46d655..331e4c662b 100644 --- a/packages/plugins/test/integration/editors/substation/general-equipment-editor-wizard-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/general-equipment-editor-wizard-editing.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/general-equipment-editor.js'; import { GeneralEquipmentEditor } from '../../../../src/editors/substation/general-equipment-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/guess-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/guess-wizarding-editing.test.ts index 25a37ce791..d652586962 100644 --- a/packages/plugins/test/integration/editors/substation/guess-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/guess-wizarding-editing.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { guessVoltageLevel } from '../../../../src/editors/substation/guess-wizard.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; import { CheckListItem } from '@material/mwc-list/mwc-check-list-item.js'; describe('guess-wizard-integration', () => { diff --git a/packages/plugins/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts b/packages/plugins/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts index b4c03fb329..3e346409a9 100644 --- a/packages/plugins/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts +++ b/packages/plugins/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/ied-editor.js'; import { IedEditor } from '../../../../src/editors/substation/ied-editor.js'; @@ -43,4 +43,4 @@ describe('IED editor component wizarding editing integration', () => { expect(referencesList).to.be.not.undefined; expect(referencesList!.length).to.equal(7); }); -}); \ No newline at end of file +}); diff --git a/packages/plugins/test/integration/editors/substation/l-node-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/l-node-editor-wizarding-editing.test.ts index be33481062..a2d01c9431 100644 --- a/packages/plugins/test/integration/editors/substation/l-node-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/l-node-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/l-node-editor.js'; import { LNodeEditor } from '../../../../src/editors/substation/l-node-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('l-node-editor wizarding editing integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/editors/substation/line-editor-wizard-editing.test.ts b/packages/plugins/test/integration/editors/substation/line-editor-wizard-editing.test.ts index a787523c61..fb601a9ab8 100644 --- a/packages/plugins/test/integration/editors/substation/line-editor-wizard-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/line-editor-wizard-editing.test.ts @@ -1,12 +1,12 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/line-editor.js'; import { LineEditor } from '../../../../src/editors/substation/line-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/lnodewizard.test.ts b/packages/plugins/test/integration/editors/substation/lnodewizard.test.ts index ef4f034667..e3b4c49441 100644 --- a/packages/plugins/test/integration/editors/substation/lnodewizard.test.ts +++ b/packages/plugins/test/integration/editors/substation/lnodewizard.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { List } from '@material/mwc-list'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { lNodeWizard } from '../../../../src/wizards/lnode.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('lnodewizard', () => { let element: MockWizardEditor; diff --git a/packages/plugins/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts index d14cdbe67c..f24baac15e 100644 --- a/packages/plugins/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/powertransformer-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/powertransformer-editor.js'; import { PowerTransformerEditor } from '../../../../src/editors/substation/powertransformer-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/process-editor-wizard-editing.test.ts b/packages/plugins/test/integration/editors/substation/process-editor-wizard-editing.test.ts index a3f6a61bf0..c79d6d59d7 100644 --- a/packages/plugins/test/integration/editors/substation/process-editor-wizard-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/process-editor-wizard-editing.test.ts @@ -1,12 +1,12 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/process-editor.js'; import { ProcessEditor } from '../../../../src/editors/substation/process-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/sub-equipment-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/sub-equipment-wizarding-editing.test.ts index 03cbba5014..e27f62680d 100644 --- a/packages/plugins/test/integration/editors/substation/sub-equipment-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/sub-equipment-wizarding-editing.test.ts @@ -1,12 +1,12 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/sub-equipment-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { SubEquipmentEditor } from '../../../../src/editors/substation/sub-equipment-editor.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/sub-function-editor.test.ts b/packages/plugins/test/integration/editors/substation/sub-function-editor.test.ts index 13b4c4f2cd..e72023613c 100644 --- a/packages/plugins/test/integration/editors/substation/sub-function-editor.test.ts +++ b/packages/plugins/test/integration/editors/substation/sub-function-editor.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/sub-function-editor.js'; import { SubFunctionEditor } from '../../../../src/editors/substation/sub-function-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts index 0ea0f93ba3..73ac620e20 100644 --- a/packages/plugins/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/substation-editor.js'; import { SubstationEditor } from '../../../../src/editors/substation/substation-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/substation-editor-wizarding.test.ts b/packages/plugins/test/integration/editors/substation/substation-editor-wizarding.test.ts index 179ef22be4..361098278c 100644 --- a/packages/plugins/test/integration/editors/substation/substation-editor-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/substation/substation-editor-wizarding.test.ts @@ -1,8 +1,8 @@ import { fixture, html, expect } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/substation-editor.js'; import { regExp, regexString } from '../../../foundation.js'; diff --git a/packages/plugins/test/integration/editors/substation/tapchanger-editor-wizard-editing.test.ts b/packages/plugins/test/integration/editors/substation/tapchanger-editor-wizard-editing.test.ts index 1818e46266..c8890bc927 100644 --- a/packages/plugins/test/integration/editors/substation/tapchanger-editor-wizard-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/tapchanger-editor-wizard-editing.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/tapchanger-editor.js'; import { TapChangerEditor } from '../../../../src/editors/substation/tapchanger-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/transformer-winding-editor-wizard-editing.test.ts b/packages/plugins/test/integration/editors/substation/transformer-winding-editor-wizard-editing.test.ts index a45c7812a1..b51ad30e16 100644 --- a/packages/plugins/test/integration/editors/substation/transformer-winding-editor-wizard-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/transformer-winding-editor-wizard-editing.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import '../../../../src/editors/substation/transformer-winding-editor.js'; import { TransformerWindingEditor } from '../../../../src/editors/substation/transformer-winding-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; const openAndCancelMenu: ( diff --git a/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts b/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts index ece59ac8ee..c34bca6b0c 100644 --- a/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts @@ -1,11 +1,11 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/voltage-level-editor.js'; import { VoltageLevelEditor } from '../../../../src/editors/substation/voltage-level-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; import { MenuBase } from '@material/mwc-menu/mwc-menu-base.js'; diff --git a/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts b/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts index 7596cf88d4..89082c4103 100644 --- a/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts @@ -1,12 +1,12 @@ import { fixture, html, expect } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/voltage-level-editor.js'; import { regexString, regExp, inverseRegExp } from '../../../foundation.js'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; +import { patterns } from '@compas-oscd/open-scd'; describe('voltage-level-editor wizarding integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/editors/substation/zeroline-pane.test.ts b/packages/plugins/test/integration/editors/substation/zeroline-pane.test.ts index 9d72d90f77..895072d113 100644 --- a/packages/plugins/test/integration/editors/substation/zeroline-pane.test.ts +++ b/packages/plugins/test/integration/editors/substation/zeroline-pane.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import '../../../../src/editors/substation/zeroline-pane.js'; import { ZerolinePane } from '../../../../src/editors/substation/zeroline-pane.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { IconButton } from '@material/mwc-icon-button'; import { ListItem } from '@material/mwc-list/mwc-list-item'; @@ -50,4 +50,4 @@ describe('zeroline-pane wizarding editing integration', () => { expect(doc.querySelector('Substation[name="newSubstation"]')).to.exist; }); -}); \ No newline at end of file +}); diff --git a/packages/plugins/test/integration/editors/templates/Templates.test.ts b/packages/plugins/test/integration/editors/templates/Templates.test.ts index e453aa88f5..d966a78e79 100644 --- a/packages/plugins/test/integration/editors/templates/Templates.test.ts +++ b/packages/plugins/test/integration/editors/templates/Templates.test.ts @@ -1,11 +1,11 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../../src/editors/Templates.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('Templates Plugin', () => { customElements.define('templates-plugin', TemplatesPlugin); diff --git a/packages/plugins/test/integration/editors/templates/datype-wizarding.test.ts b/packages/plugins/test/integration/editors/templates/datype-wizarding.test.ts index 22418a2559..418e026ccb 100644 --- a/packages/plugins/test/integration/editors/templates/datype-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/templates/datype-wizarding.test.ts @@ -1,15 +1,15 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../../src/editors/Templates.js'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import { patterns } from '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; describe('DAType wizards', () => { if (customElements.get('templates-editor') === undefined) diff --git a/packages/plugins/test/integration/editors/templates/dotype-wizarding.test.ts b/packages/plugins/test/integration/editors/templates/dotype-wizarding.test.ts index 3efde3a644..c103e5c126 100644 --- a/packages/plugins/test/integration/editors/templates/dotype-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/templates/dotype-wizarding.test.ts @@ -1,14 +1,14 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; +import { FilteredList } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../../src/editors/Templates.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { patterns } from '../../../../src/wizards/foundation/limits.js'; diff --git a/packages/plugins/test/integration/editors/templates/enumtype-wizarding.test.ts b/packages/plugins/test/integration/editors/templates/enumtype-wizarding.test.ts index 1ae355a9d9..e157e46afb 100644 --- a/packages/plugins/test/integration/editors/templates/enumtype-wizarding.test.ts +++ b/packages/plugins/test/integration/editors/templates/enumtype-wizarding.test.ts @@ -1,15 +1,15 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; +import { FilteredList } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../../src/editors/Templates.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { patterns } from '@compas-oscd/open-scd'; describe('EnumType wizards', () => { if (customElements.get('templates-editor') === undefined) diff --git a/packages/plugins/test/integration/editors/templates/lnodetype-wizard.test.ts b/packages/plugins/test/integration/editors/templates/lnodetype-wizard.test.ts index 981e7c8fd5..b742738608 100644 --- a/packages/plugins/test/integration/editors/templates/lnodetype-wizard.test.ts +++ b/packages/plugins/test/integration/editors/templates/lnodetype-wizard.test.ts @@ -1,16 +1,16 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { Select } from '@material/mwc-select'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; +import { FilteredList } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../../src/editors/Templates.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; -import { patterns } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; +import { patterns } from '@compas-oscd/open-scd'; describe('LNodeType wizards', () => { if (customElements.get('templates-editor') === undefined) diff --git a/packages/plugins/test/integration/editors/triggered/CommunicationMappingPlugin.test.ts b/packages/plugins/test/integration/editors/triggered/CommunicationMappingPlugin.test.ts index be5a3947ed..8556dd4540 100644 --- a/packages/plugins/test/integration/editors/triggered/CommunicationMappingPlugin.test.ts +++ b/packages/plugins/test/integration/editors/triggered/CommunicationMappingPlugin.test.ts @@ -1,7 +1,7 @@ /* import { expect, fixture, html } from '@open-wc/testing'; import { List } from '@material/mwc-list'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ZerolinePane } from '../../../../src/zeroline-pane.js'; describe('CommunicationMappingPlugin', () => { diff --git a/packages/plugins/test/integration/editors/triggered/ImportIedsPlugin.test.ts b/packages/plugins/test/integration/editors/triggered/ImportIedsPlugin.test.ts index 00d6c109ee..0c0e6c6634 100644 --- a/packages/plugins/test/integration/editors/triggered/ImportIedsPlugin.test.ts +++ b/packages/plugins/test/integration/editors/triggered/ImportIedsPlugin.test.ts @@ -3,8 +3,8 @@ import { LitElement, TemplateResult } from 'lit-element'; import { CheckListItem } from '@material/mwc-list/mwc-check-list-item'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import ImportingIedPlugin from '../../../../src/menu/ImportIEDs.js'; @@ -408,7 +408,9 @@ describe('ImportIedsPlugin', () => { element.prepareImport(importDoc, 'invalid.iid'); expect(parent.historyAddon.log[0].kind).to.equal('error'); - expect(parent.historyAddon.log[0].title).to.equal('No IED element in the file'); + expect(parent.historyAddon.log[0].title).to.equal( + 'No IED element in the file' + ); }); it('throws duplicate ied name error', async () => { diff --git a/packages/plugins/test/integration/menu/NewProject.test.ts b/packages/plugins/test/integration/menu/NewProject.test.ts index 6bab5f4d35..b564fc7a64 100644 --- a/packages/plugins/test/integration/menu/NewProject.test.ts +++ b/packages/plugins/test/integration/menu/NewProject.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import NewProjectPlugin from '../../../src/menu/NewProject.js'; diff --git a/packages/plugins/test/integration/menu/UpdateDescritionABB.test.ts b/packages/plugins/test/integration/menu/UpdateDescritionABB.test.ts index 4aabfd6cfb..203aab0291 100644 --- a/packages/plugins/test/integration/menu/UpdateDescritionABB.test.ts +++ b/packages/plugins/test/integration/menu/UpdateDescritionABB.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import UpdateDescriptionAbb from '../../../src/menu/UpdateDescriptionABB.js'; diff --git a/packages/plugins/test/integration/validators/ValidateSchema.test.ts b/packages/plugins/test/integration/validators/ValidateSchema.test.ts index 501ece2a21..d20524493e 100644 --- a/packages/plugins/test/integration/validators/ValidateSchema.test.ts +++ b/packages/plugins/test/integration/validators/ValidateSchema.test.ts @@ -1,11 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; -import type { Plugin } from '@openscd/open-scd/src/plugin.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; +import type { Plugin } from '@compas-oscd/open-scd'; import ValidateSchema from '../../../src/validators/ValidateSchema.js'; -import { IssueDetail, LogEntry } from '@openscd/core/foundation/deprecated/history.js'; +import { + IssueDetail, + LogEntry, +} from '@openscd/core/foundation/deprecated/history.js'; describe('ValidateSchema plugin', () => { if (customElements.get('') === undefined) @@ -19,11 +22,14 @@ describe('ValidateSchema plugin', () => { before(async () => { parent = await fixture(html` - + `); element = parent.getActivePlugin(); - element.pluginId = 'http://localhost:8000/plugins/src/validators/ValidateSchema.js'; + element.pluginId = + 'http://localhost:8000/plugins/src/validators/ValidateSchema.js'; await parent.updateComplete; }); @@ -52,7 +58,9 @@ describe('ValidateSchema plugin', () => { it('indicates successful schema validation in the diagnoses pane', async () => { const lastEntry = ( - parent.historyAddon.diagnoses.get('http://localhost:8000/plugins/src/validators/ValidateSchema.js') + parent.historyAddon.diagnoses.get( + 'http://localhost:8000/plugins/src/validators/ValidateSchema.js' + ) ); expect(lastEntry.length).to.equal(1); expect(lastEntry[0].title).to.contain( @@ -67,7 +75,6 @@ describe('ValidateSchema plugin', () => { 'valid2007B XML schema validation successful' ); }); - }); describe('for invalid SCL files', () => { @@ -96,8 +103,11 @@ describe('ValidateSchema plugin', () => { }); it('create issues in diagnose', async () => - expect(parent.historyAddon.diagnoses.get('http://localhost:8000/plugins/src/validators/ValidateSchema.js')) - .to.not.be.undefined); + expect( + parent.historyAddon.diagnoses.get( + 'http://localhost:8000/plugins/src/validators/ValidateSchema.js' + ) + ).to.not.be.undefined); it('generates error messages in the log', async () => { const lastLogEntry = parent.historyAddon.log.pop(); @@ -107,10 +117,8 @@ describe('ValidateSchema plugin', () => { ); }); }); - }); - const builtinPlugins: Plugin[] = [ { name: 'IED', @@ -141,7 +149,9 @@ const builtinPlugins: Plugin[] = [ }, { name: 'Subscriber Message Binding (GOOSE)', - src: generatePluginPath('plugins/src/editors/GooseSubscriberMessageBinding.js'), + src: generatePluginPath( + 'plugins/src/editors/GooseSubscriberMessageBinding.js' + ), icon: 'link', default: false, kind: 'editor', @@ -150,7 +160,9 @@ const builtinPlugins: Plugin[] = [ }, { name: 'Subscriber Data Binding (GOOSE)', - src: generatePluginPath('plugins/src/editors/GooseSubscriberDataBinding.js'), + src: generatePluginPath( + 'plugins/src/editors/GooseSubscriberDataBinding.js' + ), icon: 'link', default: false, kind: 'editor', @@ -159,7 +171,9 @@ const builtinPlugins: Plugin[] = [ }, { name: 'Subscriber Message Binding (SMV)', - src: generatePluginPath('plugins/src/editors/SMVSubscriberMessageBinding.js'), + src: generatePluginPath( + 'plugins/src/editors/SMVSubscriberMessageBinding.js' + ), icon: 'link', default: false, kind: 'editor', @@ -376,5 +390,5 @@ const builtinPlugins: Plugin[] = [ ]; export function generatePluginPath(plugin: string): string { - return location.origin+location.pathname+plugin; + return location.origin + location.pathname + plugin; } diff --git a/packages/plugins/test/integration/validators/ValidateTemplates.test.ts b/packages/plugins/test/integration/validators/ValidateTemplates.test.ts index 76575dcf70..2a280a0006 100644 --- a/packages/plugins/test/integration/validators/ValidateTemplates.test.ts +++ b/packages/plugins/test/integration/validators/ValidateTemplates.test.ts @@ -1,8 +1,8 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; -import type { Plugin } from '@openscd/open-scd/src/plugin.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; +import type { Plugin } from '@compas-oscd/open-scd'; import ValidateTemplates from '../../../src/validators/ValidateTemplates.js'; diff --git a/packages/plugins/test/integration/wizards/address-wizarding-editing.test.ts b/packages/plugins/test/integration/wizards/address-wizarding-editing.test.ts index 3f736e9518..3838dc26f5 100644 --- a/packages/plugins/test/integration/wizards/address-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/address-wizarding-editing.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { editGseWizard } from '../../../src/wizards/gse.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('address wizarding editing integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/bda-wizarding-editing.test.ts b/packages/plugins/test/integration/wizards/bda-wizarding-editing.test.ts index 1a9539e5a0..9002d9cc48 100644 --- a/packages/plugins/test/integration/wizards/bda-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/bda-wizarding-editing.test.ts @@ -1,16 +1,16 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import TemplatesPlugin from '../../../src/editors/Templates.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('BDA wizarding editing integration', () => { if (customElements.get('templates-editor') === undefined) diff --git a/packages/plugins/test/integration/wizards/connectedap-wizarding-editing-integration.test.ts b/packages/plugins/test/integration/wizards/connectedap-wizarding-editing-integration.test.ts index 1c7d51a29f..74173e8c4f 100644 --- a/packages/plugins/test/integration/wizards/connectedap-wizarding-editing-integration.test.ts +++ b/packages/plugins/test/integration/wizards/connectedap-wizarding-editing-integration.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { editConnectedApWizard } from '../../../src/wizards/connectedap.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('connectedap wizarding editing integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/da-wizarding-editing.test.ts b/packages/plugins/test/integration/wizards/da-wizarding-editing.test.ts index 5cc98f5c57..eef885c06b 100644 --- a/packages/plugins/test/integration/wizards/da-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/da-wizarding-editing.test.ts @@ -1,16 +1,16 @@ import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; +import { FilteredList } from '@compas-oscd/open-scd'; import { ListItem } from '@material/mwc-list/mwc-list-item'; import TemplatesPlugin from '../../../src/editors/Templates.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('DA wizarding editing integration', () => { if (customElements.get('templates-editor') === undefined) diff --git a/packages/plugins/test/integration/wizards/dataset-wizarding-editing-integration.test.ts b/packages/plugins/test/integration/wizards/dataset-wizarding-editing-integration.test.ts index 56d519db94..2790cf8845 100644 --- a/packages/plugins/test/integration/wizards/dataset-wizarding-editing-integration.test.ts +++ b/packages/plugins/test/integration/wizards/dataset-wizarding-editing-integration.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { editDataSetWizard } from '../../../src/wizards/dataset.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('dataset wizards', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/fcda-wizarding-editing-integration.test.ts b/packages/plugins/test/integration/wizards/fcda-wizarding-editing-integration.test.ts index 170d288e2d..8b00e8e6a5 100644 --- a/packages/plugins/test/integration/wizards/fcda-wizarding-editing-integration.test.ts +++ b/packages/plugins/test/integration/wizards/fcda-wizarding-editing-integration.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { createFCDAsWizard } from '../../../src/wizards/fcda.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { FinderList } from '@compas-oscd/open-scd'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('FCDA editing wizarding integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/gse-wizarding-editing-integration.test.ts b/packages/plugins/test/integration/wizards/gse-wizarding-editing-integration.test.ts index 89f8e930d5..1c81814c5e 100644 --- a/packages/plugins/test/integration/wizards/gse-wizarding-editing-integration.test.ts +++ b/packages/plugins/test/integration/wizards/gse-wizarding-editing-integration.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { editGseWizard } from '../../../src/wizards/gse.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('gse wizarding editing integration', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/gsecontrolwizarding-editing.test.ts b/packages/plugins/test/integration/wizards/gsecontrolwizarding-editing.test.ts index d60a9ea69c..45452ab7c2 100644 --- a/packages/plugins/test/integration/wizards/gsecontrolwizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/gsecontrolwizarding-editing.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; @@ -9,10 +9,10 @@ import { editGseControlWizard, selectGseControlWizard, } from '../../../src/wizards/gsecontrol.js'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { FinderList } from '@compas-oscd/open-scd'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('Wizards for SCL element GSEControl', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/reportcontrol-wizarding-editing.test.ts b/packages/plugins/test/integration/wizards/reportcontrol-wizarding-editing.test.ts index 92255bd4bd..e1f3db4a2c 100644 --- a/packages/plugins/test/integration/wizards/reportcontrol-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/reportcontrol-wizarding-editing.test.ts @@ -1,21 +1,21 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { createReportControlWizard, reportControlCopyToIedSelector, reportControlParentSelector, selectReportControlWizard, } from '../../../src/wizards/reportcontrol.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; import { CheckListItem } from '@material/mwc-list/mwc-check-list-item'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('Wizards for SCL element ReportControl', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/sampledvaluecontrol-wizarding-editing.test.ts b/packages/plugins/test/integration/wizards/sampledvaluecontrol-wizarding-editing.test.ts index 4b8cac87e1..9e6d86d49e 100644 --- a/packages/plugins/test/integration/wizards/sampledvaluecontrol-wizarding-editing.test.ts +++ b/packages/plugins/test/integration/wizards/sampledvaluecontrol-wizarding-editing.test.ts @@ -1,19 +1,19 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { FilteredList } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { createSampledValueControlWizard, selectSampledValueControlWizard, } from '../../../src/wizards/sampledvaluecontrol.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; +import { FinderList } from '@compas-oscd/open-scd'; +import { newWizardEvent } from '@compas-oscd/open-scd'; describe('Wizards for SCL element SampledValueControl', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/integration/wizards/services-wizard.test.ts b/packages/plugins/test/integration/wizards/services-wizard.test.ts index 52a5f65db2..1e79c3c3c4 100644 --- a/packages/plugins/test/integration/wizards/services-wizard.test.ts +++ b/packages/plugins/test/integration/wizards/services-wizard.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent, Wizard } from '@compas-oscd/open-scd'; import { editServicesWizard } from '../../../src/wizards/services.js'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; -import { WizardDialog } from '@openscd/open-scd/src/wizard-dialog.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; +import { WizardDialog } from '@compas-oscd/open-scd'; describe('Wizards for SCL element Services', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/editors/cleanup/datasets-container.test.ts b/packages/plugins/test/unit/editors/cleanup/datasets-container.test.ts index 0e1a38db14..324028e44a 100644 --- a/packages/plugins/test/unit/editors/cleanup/datasets-container.test.ts +++ b/packages/plugins/test/unit/editors/cleanup/datasets-container.test.ts @@ -1,8 +1,8 @@ 'use strict'; import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import '../../../../src/editors/cleanup/datasets-container.js'; import { CleanupDatasets } from '../../../../src/editors/cleanup/datasets-container.js'; diff --git a/packages/plugins/test/unit/editors/cleanup/datatypes-container.test.ts b/packages/plugins/test/unit/editors/cleanup/datatypes-container.test.ts index 224c8d5a58..65999911cc 100644 --- a/packages/plugins/test/unit/editors/cleanup/datatypes-container.test.ts +++ b/packages/plugins/test/unit/editors/cleanup/datatypes-container.test.ts @@ -1,8 +1,8 @@ 'use strict'; import { html, fixture, expect } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import '../../../../src/editors/cleanup/datatypes-container.js'; import { CleanupDataTypes } from '../../../../src/editors/cleanup/datatypes-container.js'; diff --git a/packages/plugins/test/unit/editors/ied/da-container.test.ts b/packages/plugins/test/unit/editors/ied/da-container.test.ts index 892e7597cc..178e941c68 100644 --- a/packages/plugins/test/unit/editors/ied/da-container.test.ts +++ b/packages/plugins/test/unit/editors/ied/da-container.test.ts @@ -3,7 +3,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import '../../../../src/editors/ied/da-container.js'; import { DAContainer } from '../../../../src/editors/ied/da-container.js'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import { TemplateResult } from 'lit-element'; describe('da-container', async () => { @@ -11,7 +11,7 @@ describe('da-container', async () => { let validSCL: XMLDocument; localStorage.clear(); const nsdoc81 = await fetch( - '@openscd/open-scd/test/testfiles/foundation/testFile81.nsdoc' + '@compas-oscd/open-scd'; ).then(response => response.text()); localStorage.setItem('IEC 61850-8-1', nsdoc81!); diff --git a/packages/plugins/test/unit/editors/ied/da-wizard.test.ts b/packages/plugins/test/unit/editors/ied/da-wizard.test.ts index 0581760954..03cdc4e778 100644 --- a/packages/plugins/test/unit/editors/ied/da-wizard.test.ts +++ b/packages/plugins/test/unit/editors/ied/da-wizard.test.ts @@ -1,9 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import { createDaInfoWizard } from '../../../../src/editors/ied/da-wizard.js'; import { getAncestorsFromDA } from './test-support.js'; diff --git a/packages/plugins/test/unit/editors/ied/do-container.test.ts b/packages/plugins/test/unit/editors/ied/do-container.test.ts index 95bdba88cf..f113dc4d6a 100644 --- a/packages/plugins/test/unit/editors/ied/do-container.test.ts +++ b/packages/plugins/test/unit/editors/ied/do-container.test.ts @@ -2,7 +2,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import '../../../../src/editors/ied/do-container.js'; import { DOContainer } from '../../../../src/editors/ied/do-container.js'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; describe('do-container', async () => { let element: DOContainer; diff --git a/packages/plugins/test/unit/editors/ied/do-wizard.test.ts b/packages/plugins/test/unit/editors/ied/do-wizard.test.ts index 528cc7259d..02e2300f2b 100644 --- a/packages/plugins/test/unit/editors/ied/do-wizard.test.ts +++ b/packages/plugins/test/unit/editors/ied/do-wizard.test.ts @@ -1,9 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import { createDoInfoWizard } from '../../../../src/editors/ied/do-wizard.js'; import { getAncestorsFromDO } from './test-support.js'; @@ -12,7 +12,7 @@ describe('do-wizard', async () => { let validSCL: XMLDocument; localStorage.clear(); const nsdoc74 = await fetch( - '@openscd/open-scd/test/testfiles/foundation/testFile74.nsdoc' + '@compas-oscd/open-scd'; ).then(response => response.text()); localStorage.setItem('IEC 61850-7-4', nsdoc74!); diff --git a/packages/plugins/test/unit/editors/ied/ldevice-container.test.ts b/packages/plugins/test/unit/editors/ied/ldevice-container.test.ts index a3ac3102e3..3d2927d61a 100644 --- a/packages/plugins/test/unit/editors/ied/ldevice-container.test.ts +++ b/packages/plugins/test/unit/editors/ied/ldevice-container.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { initializeNsdoc, Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc, Nsdoc } from '@compas-oscd/open-scd'; import '../../../../src/editors/ied/ldevice-container.js'; diff --git a/packages/plugins/test/unit/editors/ied/ln-container.test.ts b/packages/plugins/test/unit/editors/ied/ln-container.test.ts index c723e7517c..08168cfd2e 100644 --- a/packages/plugins/test/unit/editors/ied/ln-container.test.ts +++ b/packages/plugins/test/unit/editors/ied/ln-container.test.ts @@ -2,7 +2,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import '../../../../src/editors/ied/ln-container.js'; import { LNContainer } from '../../../../src/editors/ied/ln-container.js'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; describe('ln-container', async () => { let element: LNContainer; diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/address.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/address.test.ts index 620e2f34f9..420d5c5092 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/address.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/address.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardSelect } from '@compas-oscd/open-scd'; import { executeWizardReplaceAction, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/connectedap.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/connectedap.test.ts index 9c7dac6f82..0c209236b6 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/connectedap.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/connectedap.test.ts @@ -1,15 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { Checkbox } from '@material/mwc-checkbox'; import { createConnectedApWizard, editConnectedApWizard, } from '../../../../../src/editors/protocol104/wizards/connectedap.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { isCreate, isDelete, @@ -17,7 +17,7 @@ import { Create, Delete, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; describe('Wizards for SCL element ConnectedAP', () => { diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/createAddresses.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/createAddresses.test.ts index 2270883478..1e144326b7 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/createAddresses.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/createAddresses.test.ts @@ -1,20 +1,17 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; +import { WizardAction, WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardAction, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isSimple, - ComplexAction + ComplexAction, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { createAddressesAction, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/doi.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/doi.test.ts index b652c1d9cb..dd15bd6ed2 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/doi.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/doi.test.ts @@ -1,10 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { isSimple, ComplexAction } from '@openscd/core/foundation/deprecated/editor.js'; +import { + isSimple, + ComplexAction, +} from '@openscd/core/foundation/deprecated/editor.js'; import { remove104Private, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/logiclink.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/logiclink.test.ts index d5fc8763e2..d85215ea47 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/logiclink.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/logiclink.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { isCreate, isDelete, @@ -12,9 +12,9 @@ import { ComplexAction, Create, Delete, - Replace + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { createLogicLinkWizard, editLogicLinkWizard, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/redundancygroup.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/redundancygroup.test.ts index d6fe0cc9c0..3036490385 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/redundancygroup.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/redundancygroup.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { isCreate, isDelete, @@ -12,9 +12,9 @@ import { ComplexAction, Create, Delete, - Replace + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { createRedundancyGroupWizard, editRedundancyGroupWizard, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/selectDo.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/selectDo.test.ts index 24d30690b5..74a59f6634 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/selectDo.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/selectDo.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { getDataChildren, diff --git a/packages/plugins/test/unit/editors/protocol104/wizards/subnetwork.test.ts b/packages/plugins/test/unit/editors/protocol104/wizards/subnetwork.test.ts index a7dbacfcd1..c5a6d91607 100644 --- a/packages/plugins/test/unit/editors/protocol104/wizards/subnetwork.test.ts +++ b/packages/plugins/test/unit/editors/protocol104/wizards/subnetwork.test.ts @@ -1,15 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement, patterns } from '@compas-oscd/open-scd'; import { - WizardInputElement, - patterns, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, Create } from '@openscd/core/foundation/deprecated/editor.js'; + isCreate, + Create, +} from '@openscd/core/foundation/deprecated/editor.js'; import { createSubNetworkWizard } from '../../../../../src/editors/protocol104/wizards/subnetwork.js'; describe('SubNetwork 104 wizard', () => { diff --git a/packages/plugins/test/unit/editors/singlelinediagram/foundation.test.ts b/packages/plugins/test/unit/editors/singlelinediagram/foundation.test.ts index 6803277e5e..2d1848a639 100644 --- a/packages/plugins/test/unit/editors/singlelinediagram/foundation.test.ts +++ b/packages/plugins/test/unit/editors/singlelinediagram/foundation.test.ts @@ -3,9 +3,15 @@ import { getRelativeCoordinates, isBusBar, getConnectedTerminals, - calculateConnectivityNodeCoordinates, getCommonParentElement, + calculateConnectivityNodeCoordinates, + getCommonParentElement, } from '../../../../src/editors/singlelinediagram/foundation.js'; -import { getDescriptionAttribute, getInstanceAttribute, getNameAttribute, getPathNameAttribute } from '@openscd/open-scd/src/foundation.js'; +import { + getDescriptionAttribute, + getInstanceAttribute, + getNameAttribute, + getPathNameAttribute, +} from '@compas-oscd/open-scd'; describe('Single Line Diagram foundation', () => { let doc: Document; @@ -58,7 +64,9 @@ describe('Single Line Diagram foundation', () => { expect(getInstanceAttribute(element!)).to.eql('CircuitBreaker_CB1'); }); it('returns undefined for an element without an instance.', () => { - const element = doc.querySelector('IED[name="IED1"] > AccessPoint[name="P1"] > Server'); + const element = doc.querySelector( + 'IED[name="IED1"] > AccessPoint[name="P1"] > Server' + ); expect(getInstanceAttribute(element!)).to.be.undefined; }); }); @@ -130,37 +138,65 @@ describe('Single Line Diagram foundation', () => { }); describe('defines a getCommonParentElement function that', () => { - it("common parent between connectivity node and power transformer should be the substation", () => { + it('common parent between connectivity node and power transformer should be the substation', () => { const substation = doc.querySelector('Substation[name="AA1"]')!; - const powerTransformer = doc.querySelector('PowerTransformer[name="TA1"]')!; - const connectivityNode = doc.querySelector('Bay[name="Bay A"] > ConnectivityNode[name="L1"]')!; - expect(getCommonParentElement(powerTransformer, connectivityNode, null)).to.equal(substation); + const powerTransformer = doc.querySelector( + 'PowerTransformer[name="TA1"]' + )!; + const connectivityNode = doc.querySelector( + 'Bay[name="Bay A"] > ConnectivityNode[name="L1"]' + )!; + expect( + getCommonParentElement(powerTransformer, connectivityNode, null) + ).to.equal(substation); }); - it("common parent between connectivity node and conducting equipment should be the bay", () => { + it('common parent between connectivity node and conducting equipment should be the bay', () => { const bay = doc.querySelector('Bay[name="Bay A"]')!; - const conductingEquipment = doc.querySelector('Bay[name="Bay A"] > ConductingEquipment[name="QB1"]')!; - const connectivityNode = doc.querySelector('Bay[name="Bay A"] > ConnectivityNode[name="L1"]')!; - expect(getCommonParentElement(conductingEquipment, connectivityNode, null)).to.equal(bay); + const conductingEquipment = doc.querySelector( + 'Bay[name="Bay A"] > ConductingEquipment[name="QB1"]' + )!; + const connectivityNode = doc.querySelector( + 'Bay[name="Bay A"] > ConnectivityNode[name="L1"]' + )!; + expect( + getCommonParentElement(conductingEquipment, connectivityNode, null) + ).to.equal(bay); }); - it("common parent between two unrelated elements will be the root element", () => { - const powerTransformer = doc.querySelector('PowerTransformer[name="TA1"]')!; - const subNetwork = doc.querySelector('SubNetwork[name="StationBus"]')!; - expect(getCommonParentElement(powerTransformer, subNetwork, null)).to.equal(doc.firstElementChild); + it('common parent between two unrelated elements will be the root element', () => { + const powerTransformer = doc.querySelector( + 'PowerTransformer[name="TA1"]' + )!; + const subNetwork = doc.querySelector('SubNetwork[name="StationBus"]')!; + expect( + getCommonParentElement(powerTransformer, subNetwork, null) + ).to.equal(doc.firstElementChild); }); - it("when no common parent then the default element returned", async () => { + it('when no common parent then the default element returned', async () => { // Can only happen if from different documents, otherwise there should always be the root as common. - const otherDoc = await fetch('/test/testfiles/valid2007B4withSubstationXY.scd') + const otherDoc = await fetch( + '/test/testfiles/valid2007B4withSubstationXY.scd' + ) .then(response => response.text()) .then(str => new DOMParser().parseFromString(str, 'application/xml')); const substation = doc.querySelector('Substation[name="AA1"]')!; const bay = doc.querySelector('Bay[name="Bay A"]')!; - const conductingEquipment = doc.querySelector('Bay[name="Bay A"] > ConductingEquipment[name="QB1"]')!; - const connectivityNode = otherDoc.querySelector('Bay[name="Bay A"] > ConnectivityNode[name="L1"]')!; - expect(getCommonParentElement(conductingEquipment, connectivityNode, substation)).to.equal(substation); + const conductingEquipment = doc.querySelector( + 'Bay[name="Bay A"] > ConductingEquipment[name="QB1"]' + )!; + const connectivityNode = otherDoc.querySelector( + 'Bay[name="Bay A"] > ConnectivityNode[name="L1"]' + )!; + expect( + getCommonParentElement( + conductingEquipment, + connectivityNode, + substation + ) + ).to.equal(substation); }); }); }); diff --git a/packages/plugins/test/unit/editors/singlelinediagram/wizards/bay.test.ts b/packages/plugins/test/unit/editors/singlelinediagram/wizards/bay.test.ts index 6bd9aa9295..f3f9859100 100644 --- a/packages/plugins/test/unit/editors/singlelinediagram/wizards/bay.test.ts +++ b/packages/plugins/test/unit/editors/singlelinediagram/wizards/bay.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { executeWizardReplaceAction, @@ -10,8 +10,8 @@ import { setWizardTextFieldValue, } from '../../../wizards/test-support.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { editBayWizard } from '../../../../../src/editors/singlelinediagram/wizards/bay.js'; import { updateNamingAndCoordinatesAction } from '../../../../../src/editors/singlelinediagram/wizards/foundation.js'; diff --git a/packages/plugins/test/unit/editors/singlelinediagram/wizards/conductingequipment.test.ts b/packages/plugins/test/unit/editors/singlelinediagram/wizards/conductingequipment.test.ts index ba1c42daee..c4d4dc27aa 100644 --- a/packages/plugins/test/unit/editors/singlelinediagram/wizards/conductingequipment.test.ts +++ b/packages/plugins/test/unit/editors/singlelinediagram/wizards/conductingequipment.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { executeWizardReplaceAction, @@ -10,8 +10,8 @@ import { setWizardTextFieldValue, } from '../../../wizards/test-support.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { editConductingEquipmentWizard } from '../../../../../src/editors/singlelinediagram/wizards/conductingequipment.js'; import { updateNamingAndCoordinatesAction } from '../../../../../src/editors/singlelinediagram/wizards/foundation.js'; diff --git a/packages/plugins/test/unit/editors/singlelinediagram/wizards/powertransformer.test.ts b/packages/plugins/test/unit/editors/singlelinediagram/wizards/powertransformer.test.ts index 6f3f2758e6..85bc86e1b9 100644 --- a/packages/plugins/test/unit/editors/singlelinediagram/wizards/powertransformer.test.ts +++ b/packages/plugins/test/unit/editors/singlelinediagram/wizards/powertransformer.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { executeWizardReplaceAction, @@ -10,8 +10,8 @@ import { setWizardTextFieldValue, } from '../../../wizards/test-support.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { editPowerTransformerWizard } from '../../../../../src/editors/singlelinediagram/wizards/powertransformer.js'; import { updateNamingAndCoordinatesAction } from '../../../../../src/editors/singlelinediagram/wizards/foundation.js'; diff --git a/packages/plugins/test/unit/editors/singlelinediagram/wizards/wizard-library.test.ts b/packages/plugins/test/unit/editors/singlelinediagram/wizards/wizard-library.test.ts index 46c4e12cc4..cf69cedbc7 100644 --- a/packages/plugins/test/unit/editors/singlelinediagram/wizards/wizard-library.test.ts +++ b/packages/plugins/test/unit/editors/singlelinediagram/wizards/wizard-library.test.ts @@ -1,6 +1,6 @@ import {expect} from "@open-wc/testing"; -import {SCLTag} from "@openscd/open-scd/src/foundation.js"; +import {SCLTag} from "@compas-oscd/open-scd'; import {emptyWizard} from "../../../../../src/wizards/wizard-library.js"; import {wizards} from "../../../../../src/editors/singlelinediagram/wizards/wizard-library.js"; diff --git a/packages/plugins/test/unit/editors/subscription/fcda-binding-list.test.ts b/packages/plugins/test/unit/editors/subscription/fcda-binding-list.test.ts index 85aa388468..d57c2c54bb 100644 --- a/packages/plugins/test/unit/editors/subscription/fcda-binding-list.test.ts +++ b/packages/plugins/test/unit/editors/subscription/fcda-binding-list.test.ts @@ -1,9 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import '../../../../src/editors/subscription/fcda-binding-list.js'; import { FcdaBindingList } from '../../../../src/editors/subscription/fcda-binding-list.js'; diff --git a/packages/plugins/test/unit/editors/subscription/foundation.test.ts b/packages/plugins/test/unit/editors/subscription/foundation.test.ts index 0d427a55b1..aa1c1878f1 100644 --- a/packages/plugins/test/unit/editors/subscription/foundation.test.ts +++ b/packages/plugins/test/unit/editors/subscription/foundation.test.ts @@ -10,7 +10,7 @@ import { updateExtRefElement, } from '../../../../src/editors/subscription/foundation.js'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; describe('foundation', () => { let doc: XMLDocument; @@ -312,7 +312,7 @@ describe('foundation', () => { const extRef = getExtRef(inputs, fcda, controlBlock); - expect(extRef).to.equal(expectedExtRef) + expect(extRef).to.equal(expectedExtRef); }); it('should correctly fetch ExtRef without srcLNClass attribute', () => { @@ -332,20 +332,24 @@ describe('foundation', () => { const extRef = getExtRef(inputs, fcda, controlBlock); - expect(extRef).to.equal(expectedExtRef) + expect(extRef).to.equal(expectedExtRef); }); }); describe('regression test for bugfix 1711', () => { beforeEach(async () => { - doc = await fetch('/test/testfiles/editors/bugfix1711-can-create-extref.scd') + doc = await fetch( + '/test/testfiles/editors/bugfix1711-can-create-extref.scd' + ) .then(response => response.text()) .then(str => new DOMParser().parseFromString(str, 'application/xml')); }); it('should return true for canCreateValidExtRef on FCDA without lnInst for LN0', () => { const fcda = doc.querySelector('FCDA')!; - const controlBlock = doc.querySelector('IED[name="IED1"] GSEControl[name="gseControl"]')!; + const controlBlock = doc.querySelector( + 'IED[name="IED1"] GSEControl[name="gseControl"]' + )!; const canCreateExtRef = canCreateValidExtRef(fcda, controlBlock); diff --git a/packages/plugins/test/unit/editors/subscription/later-binding/ext-ref-ln-binding-list.test.ts b/packages/plugins/test/unit/editors/subscription/later-binding/ext-ref-ln-binding-list.test.ts index a06f7ddb70..f52b19c13d 100644 --- a/packages/plugins/test/unit/editors/subscription/later-binding/ext-ref-ln-binding-list.test.ts +++ b/packages/plugins/test/unit/editors/subscription/later-binding/ext-ref-ln-binding-list.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { initializeNsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js'; +import { initializeNsdoc } from '@compas-oscd/open-scd'; import '../../../../../src/editors/subscription/later-binding/ext-ref-ln-binding-list.js'; diff --git a/packages/plugins/test/unit/editors/substation/redirectionUI.test.ts b/packages/plugins/test/unit/editors/substation/redirectionUI.test.ts index 458aa3d003..6c6d420dc3 100644 --- a/packages/plugins/test/unit/editors/substation/redirectionUI.test.ts +++ b/packages/plugins/test/unit/editors/substation/redirectionUI.test.ts @@ -10,7 +10,7 @@ import '../../../../src/editors/substation/voltage-level-editor.js'; import { BayEditor } from '../../../../src/editors/substation/bay-editor.js'; import { SubstationEditor } from '../../../../src/editors/substation/substation-editor.js'; import { VoltageLevelEditor } from '../../../../src/editors/substation/voltage-level-editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; async function loadAndClone( cloneEntity: BayEditor | VoltageLevelEditor | SubstationEditor, diff --git a/packages/plugins/test/unit/editors/templates/datype.test.ts b/packages/plugins/test/unit/editors/templates/datype.test.ts index 7ea7671281..a6fe754a9f 100644 --- a/packages/plugins/test/unit/editors/templates/datype.test.ts +++ b/packages/plugins/test/unit/editors/templates/datype.test.ts @@ -1,17 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { - identity, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, WizardInputElement } from '@compas-oscd/open-scd'; import { ComplexAction, Replace, - isSimple + isSimple, } from '@openscd/core/foundation/deprecated/editor.js'; import { editDaTypeWizard } from '../../../../src/editors/templates/datype-wizards.js'; diff --git a/packages/plugins/test/unit/editors/templates/dotype.test.ts b/packages/plugins/test/unit/editors/templates/dotype.test.ts index 8dad5e14cb..340ceac301 100644 --- a/packages/plugins/test/unit/editors/templates/dotype.test.ts +++ b/packages/plugins/test/unit/editors/templates/dotype.test.ts @@ -1,17 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { - identity, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, WizardInputElement } from '@compas-oscd/open-scd'; import { ComplexAction, Replace, - isSimple + isSimple, } from '@openscd/core/foundation/deprecated/editor.js'; import { dOTypeWizard } from '../../../../src/editors/templates/dotype-wizards.js'; diff --git a/packages/plugins/test/unit/editors/templates/enumtype.test.ts b/packages/plugins/test/unit/editors/templates/enumtype.test.ts index 7f183baa1c..f4c8176b40 100644 --- a/packages/plugins/test/unit/editors/templates/enumtype.test.ts +++ b/packages/plugins/test/unit/editors/templates/enumtype.test.ts @@ -1,17 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { - identity, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, WizardInputElement } from '@compas-oscd/open-scd'; import { ComplexAction, Replace, - isSimple + isSimple, } from '@openscd/core/foundation/deprecated/editor.js'; import { eNumTypeEditWizard } from '../../../../src/editors/templates/enumtype-wizard.js'; diff --git a/packages/plugins/test/unit/editors/templates/lnodetype-wizard.test.ts b/packages/plugins/test/unit/editors/templates/lnodetype-wizard.test.ts index 614f091424..dcf046b64f 100644 --- a/packages/plugins/test/unit/editors/templates/lnodetype-wizard.test.ts +++ b/packages/plugins/test/unit/editors/templates/lnodetype-wizard.test.ts @@ -2,17 +2,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { - identity, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { identity, WizardInputElement } from '@compas-oscd/open-scd'; import { ComplexAction, Replace, - isSimple + isSimple, } from '@openscd/core/foundation/deprecated/editor.js'; import { lNodeTypeWizard } from '../../../../src/editors/templates/lnodetype-wizard.js'; import { regExp, regexString } from '../../../foundation.js'; diff --git a/packages/plugins/test/unit/menu/CompareIED.test.ts b/packages/plugins/test/unit/menu/CompareIED.test.ts index e231d82694..0a13d66bdb 100644 --- a/packages/plugins/test/unit/menu/CompareIED.test.ts +++ b/packages/plugins/test/unit/menu/CompareIED.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import CompareIEDPlugin from '../../../src/menu/CompareIED.js'; -import { PlainCompareList } from '@openscd/open-scd/src/plain-compare-list.js'; +import { PlainCompareList } from '@compas-oscd/open-scd'; describe('Compare IED Plugin', () => { if (customElements.get('compare-ied') === undefined) @@ -122,7 +122,5 @@ describe('Compare IED Plugin', () => { expect(plugin.selectedProjectIed).to.be.undefined; expect(plugin.selectedTemplateIed).to.be.undefined; }); - }); - }); diff --git a/packages/plugins/test/unit/menu/UpdateDescriptionSEL.test.ts b/packages/plugins/test/unit/menu/UpdateDescriptionSEL.test.ts index 5b3a3b4985..56dffb6292 100644 --- a/packages/plugins/test/unit/menu/UpdateDescriptionSEL.test.ts +++ b/packages/plugins/test/unit/menu/UpdateDescriptionSEL.test.ts @@ -1,8 +1,8 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ComplexAction, diff --git a/packages/plugins/test/unit/menu/UpdateDescritionABB.test.ts b/packages/plugins/test/unit/menu/UpdateDescritionABB.test.ts index 7bf0de4a6e..607ddee58d 100644 --- a/packages/plugins/test/unit/menu/UpdateDescritionABB.test.ts +++ b/packages/plugins/test/unit/menu/UpdateDescritionABB.test.ts @@ -1,8 +1,8 @@ import { expect, fixture, html } from '@open-wc/testing'; import sinon, { SinonSpy } from 'sinon'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import { ComplexAction, diff --git a/packages/plugins/test/unit/menu/VirtualTemplateIED.test.ts b/packages/plugins/test/unit/menu/VirtualTemplateIED.test.ts index 6b9b290292..38dfa92fbd 100644 --- a/packages/plugins/test/unit/menu/VirtualTemplateIED.test.ts +++ b/packages/plugins/test/unit/menu/VirtualTemplateIED.test.ts @@ -1,10 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import { Create, isCreate } from '@openscd/core/foundation/deprecated/editor.js'; +import { + Create, + isCreate, +} from '@openscd/core/foundation/deprecated/editor.js'; import VirtualTemplateIED from '../../../src/menu/VirtualTemplateIED.js'; import { CheckListItem } from '@material/mwc-list/mwc-check-list-item'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('Plugin that creates with some user input a virtual template IED - SPECIFICATION', () => { if (customElements.get('virtual-template-i-e-d') === undefined) diff --git a/packages/plugins/test/unit/menu/updatesubstation.test.ts b/packages/plugins/test/unit/menu/updatesubstation.test.ts index 052a3cc39b..1b817946cc 100644 --- a/packages/plugins/test/unit/menu/updatesubstation.test.ts +++ b/packages/plugins/test/unit/menu/updatesubstation.test.ts @@ -1,7 +1,7 @@ import { expect } from '@open-wc/testing'; import { isValidReference } from '../../../src/menu/UpdateSubstation.js'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; describe('isValidReference', () => { let ours: XMLDocument; diff --git a/packages/plugins/test/unit/menu/virtualtemplateied/foundation.test.ts b/packages/plugins/test/unit/menu/virtualtemplateied/foundation.test.ts index 7afdc25d1c..c922f67e5b 100644 --- a/packages/plugins/test/unit/menu/virtualtemplateied/foundation.test.ts +++ b/packages/plugins/test/unit/menu/virtualtemplateied/foundation.test.ts @@ -1,5 +1,5 @@ import { expect } from '@open-wc/testing'; -import { identity } from '@openscd/open-scd/src/foundation.js'; +import { identity } from '@compas-oscd/open-scd'; import { getFunctionNamingPrefix, diff --git a/packages/plugins/test/unit/validators/ValidateTemplates.test.ts b/packages/plugins/test/unit/validators/ValidateTemplates.test.ts index 96f80598af..e2e3152aeb 100644 --- a/packages/plugins/test/unit/validators/ValidateTemplates.test.ts +++ b/packages/plugins/test/unit/validators/ValidateTemplates.test.ts @@ -1,8 +1,8 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/test/mock-open-scd.js'; -import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js'; +import '@compas-oscd/open-scd'; +import { MockOpenSCD } from '@compas-oscd/open-scd'; import ValidateTemplates from '../../../src/validators/ValidateTemplates.js'; diff --git a/packages/plugins/test/unit/wizards/abstractda.test.ts b/packages/plugins/test/unit/wizards/abstractda.test.ts index 5e0dc217a9..eb217f453a 100644 --- a/packages/plugins/test/unit/wizards/abstractda.test.ts +++ b/packages/plugins/test/unit/wizards/abstractda.test.ts @@ -1,18 +1,18 @@ import { expect, fixture, html } from '@open-wc/testing'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { isCreate, isDelete, isReplace, - Create, - Replace - } from '@openscd/core/foundation/deprecated/editor.js'; + Create, + Replace, +} from '@openscd/core/foundation/deprecated/editor.js'; import { getValAction, wizardContent, diff --git a/packages/plugins/test/unit/wizards/accesspoint.test.ts b/packages/plugins/test/unit/wizards/accesspoint.test.ts index c11e8a3abf..165d1bef30 100644 --- a/packages/plugins/test/unit/wizards/accesspoint.test.ts +++ b/packages/plugins/test/unit/wizards/accesspoint.test.ts @@ -4,10 +4,10 @@ import { ComplexAction, isSimple, } from '@openscd/core/foundation/deprecated/editor.js'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { editAccessPointWizard, diff --git a/packages/plugins/test/unit/wizards/address.test.ts b/packages/plugins/test/unit/wizards/address.test.ts index caae4d51be..f2b6140c84 100644 --- a/packages/plugins/test/unit/wizards/address.test.ts +++ b/packages/plugins/test/unit/wizards/address.test.ts @@ -1,20 +1,16 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { getValue, Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { - getValue, - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isDelete, - Create, - Delete + Create, + Delete, } from '@openscd/core/foundation/deprecated/editor.js'; import { contentGseOrSmvWizard, diff --git a/packages/plugins/test/unit/wizards/bay.test.ts b/packages/plugins/test/unit/wizards/bay.test.ts index d454652a63..4aa3b1dea2 100644 --- a/packages/plugins/test/unit/wizards/bay.test.ts +++ b/packages/plugins/test/unit/wizards/bay.test.ts @@ -1,16 +1,13 @@ import { fixture, html, expect } from '@open-wc/testing'; +import { WizardInputElement, WizardActor } from '@compas-oscd/open-scd'; import { - WizardInputElement, - WizardActor, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isReplace, isSimple, - ComplexAction + ComplexAction, } from '@openscd/core/foundation/deprecated/editor.js'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; import { createAction } from '../../../src/wizards/bay.js'; import { replaceNamingAttributeWithReferencesAction } from '../../../src/wizards/foundation/actions.js'; @@ -68,13 +65,19 @@ describe('BayEditor', () => { }); it('returns a WizardAction which retruns one EditorAction', () => { - const wizardAction = replaceNamingAttributeWithReferencesAction(element, 'bay.action.updateBay'); + const wizardAction = replaceNamingAttributeWithReferencesAction( + element, + 'bay.action.updateBay' + ); const complexAction = getAndValidComplexAction(wizardAction); expect(complexAction.actions.length).to.equal(1); }); it('returns a WizardAction which returns an Update EditorAction', () => { - const wizardAction = replaceNamingAttributeWithReferencesAction(element, 'bay.action.updateBay'); + const wizardAction = replaceNamingAttributeWithReferencesAction( + element, + 'bay.action.updateBay' + ); const complexAction = getAndValidComplexAction(wizardAction); expect(complexAction.actions[0]).to.satisfy(isReplace); }); @@ -90,7 +93,10 @@ describe('BayEditor', () => { }); it('returns a WizardAction which returns empty EditorAction array', () => { - const wizardAction = replaceNamingAttributeWithReferencesAction(element, 'bay.action.updateBay'); + const wizardAction = replaceNamingAttributeWithReferencesAction( + element, + 'bay.action.updateBay' + ); expect(wizardAction(inputs, newWizard()).length).to.equal(0); }); }); diff --git a/packages/plugins/test/unit/wizards/bda.test.ts b/packages/plugins/test/unit/wizards/bda.test.ts index 95d634f009..c8349f9c17 100644 --- a/packages/plugins/test/unit/wizards/bda.test.ts +++ b/packages/plugins/test/unit/wizards/bda.test.ts @@ -1,19 +1,16 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { wizardContent } from '../../../src/wizards/abstractda.js'; import { createBDaAction, updateBDaAction } from '../../../src/wizards/bda.js'; diff --git a/packages/plugins/test/unit/wizards/clientln.test.ts b/packages/plugins/test/unit/wizards/clientln.test.ts index 4d0aed3158..a1014029c1 100644 --- a/packages/plugins/test/unit/wizards/clientln.test.ts +++ b/packages/plugins/test/unit/wizards/clientln.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { List } from '@material/mwc-list'; import { ListItem } from '@material/mwc-list/mwc-list-item'; @@ -170,4 +170,4 @@ describe('clientln wizards', () => { expect(reportCbs[1]).to.have.attribute('disabled'); }); }).timeout(5000); - }); \ No newline at end of file +}); diff --git a/packages/plugins/test/unit/wizards/commmap.test.ts b/packages/plugins/test/unit/wizards/commmap.test.ts index 78e6870800..065b233e1a 100644 --- a/packages/plugins/test/unit/wizards/commmap.test.ts +++ b/packages/plugins/test/unit/wizards/commmap.test.ts @@ -1,6 +1,6 @@ import { expect } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; import '../../../src/editors/substation/zeroline-pane.js'; import { @@ -11,7 +11,6 @@ import { describe('communication mapping wizard', () => { let doc: Document; - beforeEach(async () => { doc = await fetch('/test/testfiles/comm-map.scd') .then(response => response.text()) @@ -59,4 +58,4 @@ describe('communication mapping wizard', () => { ).to.be.true; }); }); -}); \ No newline at end of file +}); diff --git a/packages/plugins/test/unit/wizards/conductingequipment.test.ts b/packages/plugins/test/unit/wizards/conductingequipment.test.ts index f42374212a..4d39be10fb 100644 --- a/packages/plugins/test/unit/wizards/conductingequipment.test.ts +++ b/packages/plugins/test/unit/wizards/conductingequipment.test.ts @@ -1,13 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { Create, isCreate } from '@openscd/core/foundation/deprecated/editor.js'; + Create, + isCreate, +} from '@openscd/core/foundation/deprecated/editor.js'; import { fetchDoc } from './test-support.js'; import { createConductingEquipmentWizard } from '../../../src/wizards/conductingequipment.js'; diff --git a/packages/plugins/test/unit/wizards/connectedap-c.test.ts b/packages/plugins/test/unit/wizards/connectedap-c.test.ts index 7e7da40052..5047cd91c3 100644 --- a/packages/plugins/test/unit/wizards/connectedap-c.test.ts +++ b/packages/plugins/test/unit/wizards/connectedap-c.test.ts @@ -1,12 +1,12 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base.js'; import { createConnectedApWizard } from '../../../src/wizards/connectedap.js'; -import { newWizardEvent } from '@openscd/open-scd/src/foundation.js'; +import { newWizardEvent } from '@compas-oscd/open-scd'; function isAllMacUnique(parent: Element, serviceType: 'GSE' | 'SMV'): boolean { const allMacs = Array.from( @@ -66,7 +66,9 @@ describe('regression for bug 1700', () => { await fixture(html``) ); - doc = await fetch('/test/testfiles/wizards/bugfix_1700_connected_ap_wizard.scd') + doc = await fetch( + '/test/testfiles/wizards/bugfix_1700_connected_ap_wizard.scd' + ) .then(response => response.text()) .then(str => new DOMParser().parseFromString(str, 'application/xml')); @@ -79,7 +81,9 @@ describe('regression for bug 1700', () => { it('creates GSE and SMV in correct order', async () => { await clickListItem(element, ['IED1>S1']); - const connectedAP = parent.querySelector('ConnectedAP[iedName="IED1"][apName="S1"]'); + const connectedAP = parent.querySelector( + 'ConnectedAP[iedName="IED1"][apName="S1"]' + ); expect(connectedAP).to.exist; const children = Array.from(connectedAP!.children); const firstSMVIndex = children.findIndex(e => e.tagName === 'SMV'); diff --git a/packages/plugins/test/unit/wizards/connectedap-pattern.test.ts b/packages/plugins/test/unit/wizards/connectedap-pattern.test.ts index 3a2f58e3d8..34f79aa4c1 100644 --- a/packages/plugins/test/unit/wizards/connectedap-pattern.test.ts +++ b/packages/plugins/test/unit/wizards/connectedap-pattern.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; import fc, { integer, ipV4, nat } from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import '../../../src/editors/communication/connectedap-editor.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { ipV6, @@ -14,7 +14,7 @@ import { regExp, regexString, } from '../../foundation.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { editConnectedApWizard } from '../../../src/wizards/connectedap.js'; describe('Edit wizard for SCL element ConnectedAP', () => { diff --git a/packages/plugins/test/unit/wizards/connectedap.test.ts b/packages/plugins/test/unit/wizards/connectedap.test.ts index a0f7086881..f6db11a0fd 100644 --- a/packages/plugins/test/unit/wizards/connectedap.test.ts +++ b/packages/plugins/test/unit/wizards/connectedap.test.ts @@ -1,22 +1,20 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { Checkbox } from '@material/mwc-checkbox'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isDelete, isSimple, - ComplexAction, - Delete, - Create + ComplexAction, + Delete, + Create, } from '@openscd/core/foundation/deprecated/editor.js'; import { editConnectedApWizard } from '../../../src/wizards/connectedap.js'; diff --git a/packages/plugins/test/unit/wizards/connectivitynode.test.ts b/packages/plugins/test/unit/wizards/connectivitynode.test.ts index e2d8af677e..b280513a79 100644 --- a/packages/plugins/test/unit/wizards/connectivitynode.test.ts +++ b/packages/plugins/test/unit/wizards/connectivitynode.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { editConnectivityNodeWizard } from '../../../src/wizards/connectivitynode.js'; diff --git a/packages/plugins/test/unit/wizards/da.test.ts b/packages/plugins/test/unit/wizards/da.test.ts index b3b1efb6f9..20cc347bef 100644 --- a/packages/plugins/test/unit/wizards/da.test.ts +++ b/packages/plugins/test/unit/wizards/da.test.ts @@ -1,20 +1,17 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { wizardContent } from '../../../src/wizards/abstractda.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createDaAction, diff --git a/packages/plugins/test/unit/wizards/dai.test.ts b/packages/plugins/test/unit/wizards/dai.test.ts index 417e1baf99..596b0c9374 100644 --- a/packages/plugins/test/unit/wizards/dai.test.ts +++ b/packages/plugins/test/unit/wizards/dai.test.ts @@ -1,18 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardAction, WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardAction, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isSimple, - Create, + Create, Replace, - ComplexAction + ComplexAction, } from '@openscd/core/foundation/deprecated/editor.js'; import { fetchDoc, setWizardTextFieldValue } from './test-support.js'; diff --git a/packages/plugins/test/unit/wizards/dataset.test.ts b/packages/plugins/test/unit/wizards/dataset.test.ts index 52ac5e44ab..ee3f88552f 100644 --- a/packages/plugins/test/unit/wizards/dataset.test.ts +++ b/packages/plugins/test/unit/wizards/dataset.test.ts @@ -1,22 +1,19 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; import { editDataSetWizard } from '../../../src/wizards/dataset.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isDelete, isReplace, - Delete, - Replace + Delete, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; describe('dataset wizards', () => { diff --git a/packages/plugins/test/unit/wizards/eqfunction.test.ts b/packages/plugins/test/unit/wizards/eqfunction.test.ts index bdbecbd2dd..90475ce983 100644 --- a/packages/plugins/test/unit/wizards/eqfunction.test.ts +++ b/packages/plugins/test/unit/wizards/eqfunction.test.ts @@ -1,16 +1,16 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createEqFunctionWizard, diff --git a/packages/plugins/test/unit/wizards/eqsubfunction.test.ts b/packages/plugins/test/unit/wizards/eqsubfunction.test.ts index c0763613ef..8d9f25a954 100644 --- a/packages/plugins/test/unit/wizards/eqsubfunction.test.ts +++ b/packages/plugins/test/unit/wizards/eqsubfunction.test.ts @@ -1,16 +1,16 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createEqSubFunctionWizard, diff --git a/packages/plugins/test/unit/wizards/fcda.test.ts b/packages/plugins/test/unit/wizards/fcda.test.ts index f7a0ee1c49..5891bd3539 100644 --- a/packages/plugins/test/unit/wizards/fcda.test.ts +++ b/packages/plugins/test/unit/wizards/fcda.test.ts @@ -1,12 +1,12 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { createFCDAsWizard } from '../../../src/wizards/fcda.js'; import { isCreate } from '@openscd/core/foundation/deprecated/editor.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; describe('create wizard for FCDA element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/foundation/dai-field-type.test.ts b/packages/plugins/test/unit/wizards/foundation/dai-field-type.test.ts index e309df9ae9..3a7c26f949 100644 --- a/packages/plugins/test/unit/wizards/foundation/dai-field-type.test.ts +++ b/packages/plugins/test/unit/wizards/foundation/dai-field-type.test.ts @@ -1,9 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { Wizard, WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { CustomField, diff --git a/packages/plugins/test/unit/wizards/function.test.ts b/packages/plugins/test/unit/wizards/function.test.ts index 1be250511f..51795bb732 100644 --- a/packages/plugins/test/unit/wizards/function.test.ts +++ b/packages/plugins/test/unit/wizards/function.test.ts @@ -1,16 +1,16 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createFunctionWizard, diff --git a/packages/plugins/test/unit/wizards/generalequipment.test.ts b/packages/plugins/test/unit/wizards/generalequipment.test.ts index 925718c5de..154761c8d3 100644 --- a/packages/plugins/test/unit/wizards/generalequipment.test.ts +++ b/packages/plugins/test/unit/wizards/generalequipment.test.ts @@ -1,22 +1,22 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createGeneralEquipmentWizard, editGeneralEquipmentWizard, } from '../../../src/wizards/generalEquipment.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('Wizards for SCL GeneralEquipment element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/gse.test.ts b/packages/plugins/test/unit/wizards/gse.test.ts index a04de7849d..b2e74709a3 100644 --- a/packages/plugins/test/unit/wizards/gse.test.ts +++ b/packages/plugins/test/unit/wizards/gse.test.ts @@ -1,13 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { isCreate, isDelete, diff --git a/packages/plugins/test/unit/wizards/gsecontrol.test.ts b/packages/plugins/test/unit/wizards/gsecontrol.test.ts index 24fdc13b10..bd63e781e7 100644 --- a/packages/plugins/test/unit/wizards/gsecontrol.test.ts +++ b/packages/plugins/test/unit/wizards/gsecontrol.test.ts @@ -2,23 +2,20 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; import fc from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { Wizard, WizardInputElement } from '@compas-oscd/open-scd'; import { - Wizard, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isDelete, isReplace, isSimple, - ComplexAction, - Create, - Delete, - Replace + ComplexAction, + Create, + Delete, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { contentGseControlWizard, @@ -30,7 +27,7 @@ import { updateGseControlAction, } from '../../../src/wizards/gsecontrol.js'; import { regExp, regexString } from '../../foundation.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; describe('gsecontrol wizards', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/ied.test.ts b/packages/plugins/test/unit/wizards/ied.test.ts index 7ab54742dc..f608fda66e 100644 --- a/packages/plugins/test/unit/wizards/ied.test.ts +++ b/packages/plugins/test/unit/wizards/ied.test.ts @@ -1,11 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { isSimple, ComplexAction } from '@openscd/core/foundation/deprecated/editor.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { + isSimple, + ComplexAction, +} from '@openscd/core/foundation/deprecated/editor.js'; import { editIEDWizard, removeIEDAndReferences, diff --git a/packages/plugins/test/unit/wizards/ldevice.test.ts b/packages/plugins/test/unit/wizards/ldevice.test.ts index b688f2e57d..fdbca6e839 100644 --- a/packages/plugins/test/unit/wizards/ldevice.test.ts +++ b/packages/plugins/test/unit/wizards/ldevice.test.ts @@ -1,13 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { - WizardInputElement, - getValue, -} from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement, getValue } from '@compas-oscd/open-scd'; import { createUpdateAction } from '@openscd/core/foundation/deprecated/editor.js'; import { editLDeviceWizard } from '../../../src/wizards/ldevice.js'; import { diff --git a/packages/plugins/test/unit/wizards/line.test.ts b/packages/plugins/test/unit/wizards/line.test.ts index 1016531b46..d3db36be24 100644 --- a/packages/plugins/test/unit/wizards/line.test.ts +++ b/packages/plugins/test/unit/wizards/line.test.ts @@ -1,20 +1,20 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { SinonSpy, spy } from 'sinon'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createLineWizard, editLineWizard } from '../../../src/wizards/line.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('Wizards for SCL Line element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/ln.test.ts b/packages/plugins/test/unit/wizards/ln.test.ts index a4f98420b1..986fae7c8e 100644 --- a/packages/plugins/test/unit/wizards/ln.test.ts +++ b/packages/plugins/test/unit/wizards/ln.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { editLNWizard } from '../../../src/wizards/ln.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { fetchDoc, setWizardTextFieldValue } from './test-support.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('ln wizards', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/ln0.test.ts b/packages/plugins/test/unit/wizards/ln0.test.ts index 495878e119..3e75404393 100644 --- a/packages/plugins/test/unit/wizards/ln0.test.ts +++ b/packages/plugins/test/unit/wizards/ln0.test.ts @@ -1,11 +1,11 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { editLN0Wizard } from '../../../src/wizards/ln0.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { fetchDoc } from './test-support.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('ln0 wizards', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/lnode.test.ts b/packages/plugins/test/unit/wizards/lnode.test.ts index a9c3f44a8b..107e66b3dd 100644 --- a/packages/plugins/test/unit/wizards/lnode.test.ts +++ b/packages/plugins/test/unit/wizards/lnode.test.ts @@ -2,20 +2,17 @@ import { expect, fixture, html } from '@open-wc/testing'; import fc from 'fast-check'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/test/mock-wizard-editor.js'; -import { MockWizardEditor } from '@openscd/open-scd/test/mock-wizard-editor.js'; +import '@compas-oscd/open-scd'; +import { MockWizardEditor } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { newWizardEvent, WizardInputElement } from '@compas-oscd/open-scd'; import { - newWizardEvent, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { - isCreate, - Create, - Replace + isCreate, + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { regExp, regexString } from '../../foundation.js'; import { editLNodeWizard, lNodeWizard } from '../../../src/wizards/lnode.js'; diff --git a/packages/plugins/test/unit/wizards/optfields.test.ts b/packages/plugins/test/unit/wizards/optfields.test.ts index de1d2d5bb7..ab57968f58 100644 --- a/packages/plugins/test/unit/wizards/optfields.test.ts +++ b/packages/plugins/test/unit/wizards/optfields.test.ts @@ -1,12 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; - -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { Replace, isReplace } from '@openscd/core/foundation/deprecated/editor.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; + +import { WizardSelect } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { + Replace, + isReplace, +} from '@openscd/core/foundation/deprecated/editor.js'; import { editOptFieldsWizard } from '../../../src/wizards/optfields.js'; describe('Wizards for SCL OptFields element', () => { diff --git a/packages/plugins/test/unit/wizards/powertransformer.test.ts b/packages/plugins/test/unit/wizards/powertransformer.test.ts index b702798394..4d658716c0 100644 --- a/packages/plugins/test/unit/wizards/powertransformer.test.ts +++ b/packages/plugins/test/unit/wizards/powertransformer.test.ts @@ -1,10 +1,10 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { replaceNamingAction } from '../../../src/wizards/foundation/actions.js'; import { diff --git a/packages/plugins/test/unit/wizards/process.test.ts b/packages/plugins/test/unit/wizards/process.test.ts index 0bac36af83..22af0a9c97 100644 --- a/packages/plugins/test/unit/wizards/process.test.ts +++ b/packages/plugins/test/unit/wizards/process.test.ts @@ -1,17 +1,17 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { SinonSpy, spy } from 'sinon'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isReplace, - Create, - Replace + Create, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createProcessWizard, diff --git a/packages/plugins/test/unit/wizards/reportcontrol.test.ts b/packages/plugins/test/unit/wizards/reportcontrol.test.ts index 9f9d0383a4..abafbde05f 100644 --- a/packages/plugins/test/unit/wizards/reportcontrol.test.ts +++ b/packages/plugins/test/unit/wizards/reportcontrol.test.ts @@ -2,20 +2,20 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; import fc, { integer } from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isDelete, isSimple, - ComplexAction, - Create, - Delete, - Replace + ComplexAction, + Create, + Delete, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; import { reportControlParentSelector, createReportControlWizard, @@ -25,8 +25,8 @@ import { reportControlCopyToIedSelector, } from '../../../src/wizards/reportcontrol.js'; import { inverseRegExp, regExp, regexString } from '../../foundation.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; -import { FilteredList } from '@openscd/open-scd/src/filtered-list.js'; +import { FinderList } from '@compas-oscd/open-scd'; +import { FilteredList } from '@compas-oscd/open-scd'; import { ListItemBase } from '@material/mwc-list/mwc-list-item-base'; describe('Wizards for SCL ReportControl element', () => { diff --git a/packages/plugins/test/unit/wizards/sampledvaluecontrol.test.ts b/packages/plugins/test/unit/wizards/sampledvaluecontrol.test.ts index 833e3cd99b..a15a7be021 100644 --- a/packages/plugins/test/unit/wizards/sampledvaluecontrol.test.ts +++ b/packages/plugins/test/unit/wizards/sampledvaluecontrol.test.ts @@ -1,19 +1,19 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { isCreate, isDelete, isReplace, isSimple, - ComplexAction, - Create, - Delete, - Replace + ComplexAction, + Create, + Delete, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createSampledValueControlWizard, @@ -23,9 +23,9 @@ import { } from '../../../src/wizards/sampledvaluecontrol.js'; import fc, { integer } from 'fast-check'; import { inverseRegExp, regExp, regexString } from '../../foundation.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; -import { FinderList } from '@openscd/open-scd/src/finder-list.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; +import { FinderList } from '@compas-oscd/open-scd'; describe('Wizards for SCL element SampledValueControl', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/smv.test.ts b/packages/plugins/test/unit/wizards/smv.test.ts index 382d08af4e..ae4adfb081 100644 --- a/packages/plugins/test/unit/wizards/smv.test.ts +++ b/packages/plugins/test/unit/wizards/smv.test.ts @@ -2,10 +2,10 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; import fc, { hexaString, integer } from 'fast-check'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { ComplexAction, Create, @@ -13,7 +13,7 @@ import { } from '@openscd/core/foundation/deprecated/editor.js'; import { editSMvWizard } from '../../../src/wizards/smv.js'; import { invertedRegex, MAC, regExp } from '../../foundation.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; describe('Wizards for SCL element SMV', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/smvopts.test.ts b/packages/plugins/test/unit/wizards/smvopts.test.ts index ec2ff12e0c..0c8d87c5b6 100644 --- a/packages/plugins/test/unit/wizards/smvopts.test.ts +++ b/packages/plugins/test/unit/wizards/smvopts.test.ts @@ -1,11 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; - -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; -import { Replace, isReplace } from '@openscd/core/foundation/deprecated/editor.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; + +import { WizardCheckbox } from '@compas-oscd/open-scd'; +import { + Replace, + isReplace, +} from '@openscd/core/foundation/deprecated/editor.js'; import { editSmvOptsWizard } from '../../../src/wizards/smvopts.js'; describe('Wizards for SCL SmvOpts element', () => { diff --git a/packages/plugins/test/unit/wizards/sub-equipment.test.ts b/packages/plugins/test/unit/wizards/sub-equipment.test.ts index 2a296db314..ccaf69cc2c 100644 --- a/packages/plugins/test/unit/wizards/sub-equipment.test.ts +++ b/packages/plugins/test/unit/wizards/sub-equipment.test.ts @@ -1,12 +1,12 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { - Create, +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { + Create, Replace, isCreate, isReplace, @@ -15,7 +15,7 @@ import { editSubEquipmentWizard, createSubEquipmentWizard, } from '../../../src/wizards/subequipment.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('Wizards for SCL SubEquipment element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/subfunction.test.ts b/packages/plugins/test/unit/wizards/subfunction.test.ts index 6d14cb3924..89396bb64a 100644 --- a/packages/plugins/test/unit/wizards/subfunction.test.ts +++ b/packages/plugins/test/unit/wizards/subfunction.test.ts @@ -1,13 +1,13 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { - Create, +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { + Create, Replace, isCreate, isReplace, diff --git a/packages/plugins/test/unit/wizards/subnetwork.test.ts b/packages/plugins/test/unit/wizards/subnetwork.test.ts index dfe18d7157..5df07fd17d 100644 --- a/packages/plugins/test/unit/wizards/subnetwork.test.ts +++ b/packages/plugins/test/unit/wizards/subnetwork.test.ts @@ -1,21 +1,18 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement, patterns } from '@compas-oscd/open-scd'; import { - WizardInputElement, - patterns, -} from '@openscd/open-scd/src/foundation.js'; -import { isCreate, isDelete, isReplace, - Create, - Delete, - Replace + Create, + Delete, + Replace, } from '@openscd/core/foundation/deprecated/editor.js'; import { createSubNetworkWizard, diff --git a/packages/plugins/test/unit/wizards/substation.test.ts b/packages/plugins/test/unit/wizards/substation.test.ts index 77fdbc90ef..a5ef7c8a9f 100644 --- a/packages/plugins/test/unit/wizards/substation.test.ts +++ b/packages/plugins/test/unit/wizards/substation.test.ts @@ -1,13 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { isSimple, ComplexAction } from '@openscd/core/foundation/deprecated/editor.js'; + isSimple, + ComplexAction, +} from '@openscd/core/foundation/deprecated/editor.js'; import { executeWizardCreateAction, diff --git a/packages/plugins/test/unit/wizards/tapchanger.test.ts b/packages/plugins/test/unit/wizards/tapchanger.test.ts index 1ea8938ed4..d742aa3c2e 100644 --- a/packages/plugins/test/unit/wizards/tapchanger.test.ts +++ b/packages/plugins/test/unit/wizards/tapchanger.test.ts @@ -1,14 +1,14 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; - -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardInputElement } from '@openscd/open-scd/src/foundation.js'; -import { - Create, - Replace, +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; + +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; +import { + Create, + Replace, isCreate, isReplace, } from '@openscd/core/foundation/deprecated/editor.js'; @@ -16,7 +16,7 @@ import { createTapChangerWizard, editTapChangerWizard, } from '../../../src/wizards/tapchanger.js'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('Wizards for SCL TapChanger element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/terminal.test.ts b/packages/plugins/test/unit/wizards/terminal.test.ts index 824b89fbe1..c83bc49282 100644 --- a/packages/plugins/test/unit/wizards/terminal.test.ts +++ b/packages/plugins/test/unit/wizards/terminal.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; import { editTerminalWizard } from '../../../src/wizards/terminal.js'; diff --git a/packages/plugins/test/unit/wizards/test-support.ts b/packages/plugins/test/unit/wizards/test-support.ts index 85a6ba1440..5913e29d18 100644 --- a/packages/plugins/test/unit/wizards/test-support.ts +++ b/packages/plugins/test/unit/wizards/test-support.ts @@ -1,22 +1,19 @@ import { expect } from '@open-wc/testing'; +import { WizardActor, WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardActor, - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { - SimpleAction, - Create, - Delete, + SimpleAction, + Create, + Delete, Replace, Update, isCreate, isDelete, isReplace, - isUpdate + isUpdate, } from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardSelect } from '@compas-oscd/open-scd'; export async function setWizardTextFieldValue( field: WizardTextField, diff --git a/packages/plugins/test/unit/wizards/transformerwinding.test.ts b/packages/plugins/test/unit/wizards/transformerwinding.test.ts index b29d48e004..0cec25ecd4 100644 --- a/packages/plugins/test/unit/wizards/transformerwinding.test.ts +++ b/packages/plugins/test/unit/wizards/transformerwinding.test.ts @@ -1,19 +1,22 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; -import { WizardTextField } from '@openscd/open-scd/src/wizard-textfield.js'; +import { WizardTextField } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { Create, Replace, isCreate, isReplace } from '@openscd/core/foundation/deprecated/editor.js'; + Create, + Replace, + isCreate, + isReplace, +} from '@openscd/core/foundation/deprecated/editor.js'; import { createTransformerWindingWizard, editTransformerWindingWizard, } from '../../../src/wizards/transformerWinding'; -import { WizardCheckbox } from '@openscd/open-scd/src/wizard-checkbox.js'; +import { WizardCheckbox } from '@compas-oscd/open-scd'; describe('Wizards for SCL TransformerWinding element', () => { let doc: XMLDocument; diff --git a/packages/plugins/test/unit/wizards/trgops.test.ts b/packages/plugins/test/unit/wizards/trgops.test.ts index 3c67951b06..2db019011c 100644 --- a/packages/plugins/test/unit/wizards/trgops.test.ts +++ b/packages/plugins/test/unit/wizards/trgops.test.ts @@ -1,14 +1,15 @@ import { expect, fixture, html } from '@open-wc/testing'; import { SinonSpy, spy } from 'sinon'; -import '@openscd/open-scd/src/addons/Wizards.js'; -import { OscdWizards } from '@openscd/open-scd/src/addons/Wizards.js'; +import '@compas-oscd/open-scd'; +import { OscdWizards } from '@compas-oscd/open-scd'; +import { WizardInputElement } from '@compas-oscd/open-scd'; import { - WizardInputElement, -} from '@openscd/open-scd/src/foundation.js'; -import { Replace, isReplace} from '@openscd/core/foundation/deprecated/editor.js'; -import { WizardSelect } from '@openscd/open-scd/src/wizard-select.js'; + Replace, + isReplace, +} from '@openscd/core/foundation/deprecated/editor.js'; +import { WizardSelect } from '@compas-oscd/open-scd'; import { editTrgOpsWizard } from '../../../src/wizards/trgops.js'; describe('Wizards for SCL TrgOps element', () => { diff --git a/packages/plugins/test/unit/wizards/voltagelevel.test.ts b/packages/plugins/test/unit/wizards/voltagelevel.test.ts index 2707f7a0cf..7297a2aef0 100644 --- a/packages/plugins/test/unit/wizards/voltagelevel.test.ts +++ b/packages/plugins/test/unit/wizards/voltagelevel.test.ts @@ -1,17 +1,14 @@ import { fixture, html, expect } from '@open-wc/testing'; -import '@openscd/open-scd/src/wizard-textfield.js'; +import '@compas-oscd/open-scd'; +import { WizardInputElement, WizardActor } from '@compas-oscd/open-scd'; import { - WizardInputElement, - WizardActor, -} from '@openscd/open-scd/src/foundation.js'; -import { ComplexAction, isCreate, isReplace, isDelete, isSimple, - } from '@openscd/core/foundation/deprecated/editor.js'; +} from '@openscd/core/foundation/deprecated/editor.js'; import { createAction, updateAction, @@ -33,9 +30,7 @@ describe('VoltageLevelEditor', () => { ['name', 'desc', 'nomFreq', 'numPhases', 'Voltage'].map( label => >( - fixture( - html`` - ) + fixture(html``) ) ) ); @@ -165,7 +160,6 @@ describe('VoltageLevelEditor', () => { }); describe('with nulled properties', () => { - describe('has an updateAction that', () => { describe('with present child element Voltage', () => { let element: Element;