diff --git a/custom-elements.json b/custom-elements.json index e9a14e0..ed9257b 100644 --- a/custom-elements.json +++ b/custom-elements.json @@ -1535,7 +1535,7 @@ }, { "kind": "js", - "name": "OscdEditorDiff", + "name": "default", "declaration": { "name": "OscdEditorDiff", "module": "oscd-editor-diff.ts" diff --git a/demo/index.html b/demo/index.html index cdcd5d3..52cb70f 100644 --- a/demo/index.html +++ b/demo/index.html @@ -1,4 +1,4 @@ -oscd-designer demo +oscd-editor-diff demo diff --git a/demo/plugins.js b/demo/plugins.js index 3d07b89..5bbc3bf 100644 --- a/demo/plugins.js +++ b/demo/plugins.js @@ -2,12 +2,14 @@ import OscdMenuOpen from '@omicronenergy/oscd-menu-open'; import OscdMenuSave from '@omicronenergy/oscd-menu-save'; import OscdBackgroundEditV1 from '@omicronenergy/oscd-background-editv1'; -import { OscdEditorDiff } from '../oscd-editor-diff.js'; +import OscdEditorDiff from '../dist/oscd-editor-diff.js'; -customElements.define('oscd-menu-open', OscdMenuOpen); -customElements.define('oscd-menu-save', OscdMenuSave); -customElements.define('oscd-background-editv1', OscdBackgroundEditV1); -customElements.define('oscd-editor-diff', OscdEditorDiff); +const { registry } = document.querySelector('oscd-shell'); + +registry.define('oscd-menu-open', OscdMenuOpen); +registry.define('oscd-menu-save', OscdMenuSave); +registry.define('oscd-background-editv1', OscdBackgroundEditV1); +registry.define('oscd-editor-diff', OscdEditorDiff); export const plugins = { menu: [ @@ -28,8 +30,8 @@ export const plugins = { editor: [ { name: 'Diff', + translations: { de: 'Vergleichen' }, icon: 'difference', - active: true, requireDoc: true, tagName: 'oscd-editor-diff', }, diff --git a/oscd-editor-diff.ts b/oscd-editor-diff.ts index 47d885e..0bb4a21 100644 --- a/oscd-editor-diff.ts +++ b/oscd-editor-diff.ts @@ -1,7 +1,7 @@ import { LitElement, html, css, nothing } from 'lit'; import { property, query, state } from 'lit/decorators.js'; -import { identity } from '@openenergytools/scl-lib'; +import { identity } from '@openscd/scl-lib'; import '@material/web/all.js'; import type { MdDialog, MdFilledSelect, MdMenu } from '@material/web/all.js'; @@ -189,7 +189,7 @@ function describeConfigurable( return html`${verb}${object}${exceptions}`; } -export class OscdEditorDiff extends LitElement { +export default class OscdEditorDiff extends LitElement { @property() docName = ''; @property() doc?: XMLDocument; diff --git a/package-lock.json b/package-lock.json index 992ee31..d609e03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "oscd-editor-diff", + "name": "@omicronenergy/oscd-editor-diff", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "oscd-editor-diff", + "name": "@omicronenergy/oscd-editor-diff", "version": "0.0.1", "license": "Apache-2.0", "dependencies": { @@ -14,8 +14,9 @@ "@omicronenergy/oscd-background-editv1": "^0.0.6", "@omicronenergy/oscd-menu-open": "^0.0.6", "@omicronenergy/oscd-menu-save": "^0.0.1", - "@omicronenergy/oscd-shell": "^0.0.8", - "@openenergytools/scl-lib": "^1.2.0", + "@omicronenergy/oscd-shell": "^0.0.10", + "@openscd/scl-lib": "^2.0.0", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", "lit": "^3.3.0", "tslib": "^2.8.1", "xxhash-wasm": "^1.1.0" @@ -1967,21 +1968,21 @@ } }, "node_modules/@emnapi/core": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz", - "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz", + "integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.0.4", + "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz", - "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz", + "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==", "dev": true, "license": "MIT", "optional": true, @@ -1990,9 +1991,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz", - "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", + "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==", "dev": true, "license": "MIT", "optional": true, @@ -2910,9 +2911,9 @@ } }, "node_modules/@omicronenergy/oscd-api": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-api/-/oscd-api-0.1.1.tgz", - "integrity": "sha512-+qKAeU9njV1UhIDyFVfQH3g7o0PMRkPA9d9HBMobcVHEJUGhMT/ioUVgGENqQHJrpq6gbhdNxOYhXi+YNAxFlw==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-api/-/oscd-api-0.1.3.tgz", + "integrity": "sha512-+bXly0FU+SrfQ8zElC5E+I61ly9ssZfWcGXfT+iK0xrJtQl61pKthge3Njq6VGixwFqwu1WETALcEec0TpkRgg==", "license": "Apache-2.0", "dependencies": { "tslib": "^2.8.1" @@ -2960,13 +2961,210 @@ } }, "node_modules/@omicronenergy/oscd-editor": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-editor/-/oscd-editor-1.5.0.tgz", - "integrity": "sha512-kVM8atbQThjp8bGnbUKwufPba9QZbjbcgKaBboWfeycPnaeVBoPxUb7XqOrzdc1kIzbKgMc+PBa/P9XmPEyb8w==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-editor/-/oscd-editor-1.7.1.tgz", + "integrity": "sha512-oPhfvEXS4ZsBJJzD5xggIRG69W0bEpM3GNzabunR060qUkBhR5K90N7RSTvCy8Wu3YZgr2Aw+RKRtfbXF1P39Q==", + "license": "Apache-2.0", + "dependencies": { + "@openscd/oscd-api": "^0.1.6" + } + }, + "node_modules/@omicronenergy/oscd-editor/node_modules/@openscd/oscd-api": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@openscd/oscd-api/-/oscd-api-0.1.6.tgz", + "integrity": "sha512-AqoHwQPsyiKxR8OVV3nOGgMMeiXgt2WAODZVcW0zLy7pLcZAROVzbvindiX3s09FuEOFY7UMyozmDmk1UXZJHg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-material-web-base": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-material-web-base/-/oscd-material-web-base-2.4.0.tgz", + "integrity": "sha512-ekoyznZoaY7MuqF37YkVKacJyDdkEF3cRS8UIHJjjlSeWIn/omM8HA3ds0kggS2e1BxC96Oa33iK256Up4nojg==", + "license": "Apache-2.0", + "workspaces": [ + "catalog" + ], + "dependencies": { + "@open-wc/scoped-elements": "^3.0.6", + "lit": "^3.3.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-commons/-/oscd-menu-commons-0.0.1.tgz", + "integrity": "sha512-+vl3UkDUZkqPUe/Mc2nmPhEE2IIIBV6LZWbRLqiZTn/m07H2isk4Hy78X+fWNM4H54agMZ6egFkWT49C+hKgdw==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.3", + "@omicronenergy/oscd-background-editv1": "^0.0.6", + "@omicronenergy/oscd-menu-open": "^0.0.6", + "@omicronenergy/oscd-menu-save": "^0.0.2", + "@omicronenergy/oscd-shell": "^0.0.8", + "@omicronenergy/oscd-test-utils": "^0.0.8", + "@omicronenergy/oscd-ui": "^0.0.9", + "@open-wc/scoped-elements": "^3.0.6", + "@openscd/oscd-api": "^0.1.5", + "lit": "^3.3.1", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.2.tgz", + "integrity": "sha512-+r9ZldhrrIwzGTbE4AY5bQeKDIGmoMawyNbDpYXMvHA7TjunyDWgOm1LgfW1IACMOnWyDmJqBnFJNujwtbqd1Q==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-background-editv1": "^0.0.6", + "@omicronenergy/oscd-menu-open": "^0.0.6", + "@omicronenergy/oscd-menu-save": "^0.0.1", + "@omicronenergy/oscd-shell": "^0.0.8", + "@open-wc/scoped-elements": "^3.0.6", + "lit": "^3.3.1", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.1.tgz", + "integrity": "sha512-g0Bl7NOflkbhAidqXSIpyjgiDr5aDernct14zkAIZI9P6zRgs1T2pTJCJddsfzgCvrdRVLKgO8NvgAozrGQ/Qw==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-shell": "^0.0.7", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.7.tgz", + "integrity": "sha512-R+QuNLyxCMy+MeQ9Vecn/4Zlw9hwBpJLEDNGsGk2oODQOCJzfB9Dl93I8nr5VD4pEbP5pDKMO5kWOHN7A277GA==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.0", + "@omicronenergy/oscd-editor": "^1.5.0", + "@omicronenergy/oscd-test-utils": "^0.0.7", + "@omicronenergy/oscd-ui": "^0.0.4", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.6.3" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-test-utils": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.7.tgz", + "integrity": "sha512-wK/t1+QBJVMT9JnOkgR6xbkB0w7Cnv7OhF0id8sS9Btv+5Bmf/5sRIi1yA9EIDEH3wtXb8vd3PiYd3LhvnawGA==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.0", + "@open-wc/testing": "4.0.0", + "fast-check": "^3.22.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.4.tgz", + "integrity": "sha512-qaMzMn1Pq0/fzQ0pGRRFBz0JnNa1pIeSDSLM/X+avW32arLBcU1QOUCGlVNohZr9P2YDmEwovgS1JXXmBvadZA==", + "license": "Apache-2.0", + "dependencies": { + "@material/web": "2.3.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.0.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.8.tgz", + "integrity": "sha512-0kT3iNHHGCFy0Ow0iqXX+VPdM6nvzNmnXj3DfzfpmVGjuc1RqyLqOF5iSilDRxBNhJcuZuX4LIn2uuE5kpXCpA==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.0", + "@omicronenergy/oscd-background-editv1": "^0.0.6", + "@omicronenergy/oscd-editor": "^1.5.0", + "@omicronenergy/oscd-menu-open": "^0.0.6", + "@omicronenergy/oscd-menu-save": "^0.0.1", + "@omicronenergy/oscd-test-utils": "^0.0.7", + "@omicronenergy/oscd-ui": "^0.0.4", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.6.3" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.1.tgz", + "integrity": "sha512-g0Bl7NOflkbhAidqXSIpyjgiDr5aDernct14zkAIZI9P6zRgs1T2pTJCJddsfzgCvrdRVLKgO8NvgAozrGQ/Qw==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-shell": "^0.0.7", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.7.tgz", + "integrity": "sha512-R+QuNLyxCMy+MeQ9Vecn/4Zlw9hwBpJLEDNGsGk2oODQOCJzfB9Dl93I8nr5VD4pEbP5pDKMO5kWOHN7A277GA==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.0", + "@omicronenergy/oscd-editor": "^1.5.0", + "@omicronenergy/oscd-test-utils": "^0.0.7", + "@omicronenergy/oscd-ui": "^0.0.4", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.6.3" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-test-utils": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.7.tgz", + "integrity": "sha512-wK/t1+QBJVMT9JnOkgR6xbkB0w7Cnv7OhF0id8sS9Btv+5Bmf/5sRIi1yA9EIDEH3wtXb8vd3PiYd3LhvnawGA==", "license": "Apache-2.0", "dependencies": { "@omicronenergy/oscd-api": "^0.1.0", - "@omicronenergy/oscd-test-utils": "^0.0.6" + "@open-wc/testing": "4.0.0", + "fast-check": "^3.22.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.4.tgz", + "integrity": "sha512-qaMzMn1Pq0/fzQ0pGRRFBz0JnNa1pIeSDSLM/X+avW32arLBcU1QOUCGlVNohZr9P2YDmEwovgS1JXXmBvadZA==", + "license": "Apache-2.0", + "dependencies": { + "@material/web": "2.3.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.0.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-menu-commons/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.9.tgz", + "integrity": "sha512-ziRUJWVxm7aAMPcNVnsFQCjkYWNsKWVRdHoizKEsXz14SQJUYEMLSO9fnmwn74VIqqCWF5Y1YS0QR7v4DDK/1g==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-material-web-base": "^2.4.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.8.1" } }, "node_modules/@omicronenergy/oscd-menu-open": { @@ -3050,6 +3248,96 @@ } }, "node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.10.tgz", + "integrity": "sha512-DZb6iWd9OPC7qXutl3zJHhOl8nYzuaoVD/v515uDtfQTttUKQV82xb94Ma9zhWo/RIOulvZSdU2Wwq4j7iCs9A==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-background-editv1": "^0.0.6", + "@omicronenergy/oscd-editor": "^1.7.1", + "@omicronenergy/oscd-menu-commons": "^0.0.1", + "@omicronenergy/oscd-menu-open": "^0.0.6", + "@omicronenergy/oscd-menu-save": "^0.0.2", + "@omicronenergy/oscd-test-utils": "^0.0.8", + "@omicronenergy/oscd-ui": "^0.0.9", + "@open-wc/scoped-elements": "^3.0.6", + "@openscd/oscd-api": "^0.1.6", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.1", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.2.tgz", + "integrity": "sha512-+r9ZldhrrIwzGTbE4AY5bQeKDIGmoMawyNbDpYXMvHA7TjunyDWgOm1LgfW1IACMOnWyDmJqBnFJNujwtbqd1Q==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-background-editv1": "^0.0.6", + "@omicronenergy/oscd-menu-open": "^0.0.6", + "@omicronenergy/oscd-menu-save": "^0.0.1", + "@omicronenergy/oscd-shell": "^0.0.8", + "@open-wc/scoped-elements": "^3.0.6", + "lit": "^3.3.1", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.1.tgz", + "integrity": "sha512-g0Bl7NOflkbhAidqXSIpyjgiDr5aDernct14zkAIZI9P6zRgs1T2pTJCJddsfzgCvrdRVLKgO8NvgAozrGQ/Qw==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-shell": "^0.0.7", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.7.tgz", + "integrity": "sha512-R+QuNLyxCMy+MeQ9Vecn/4Zlw9hwBpJLEDNGsGk2oODQOCJzfB9Dl93I8nr5VD4pEbP5pDKMO5kWOHN7A277GA==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.0", + "@omicronenergy/oscd-editor": "^1.5.0", + "@omicronenergy/oscd-test-utils": "^0.0.7", + "@omicronenergy/oscd-ui": "^0.0.4", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.6.3" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-test-utils": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.7.tgz", + "integrity": "sha512-wK/t1+QBJVMT9JnOkgR6xbkB0w7Cnv7OhF0id8sS9Btv+5Bmf/5sRIi1yA9EIDEH3wtXb8vd3PiYd3LhvnawGA==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.0", + "@open-wc/testing": "4.0.0", + "fast-check": "^3.22.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.4.tgz", + "integrity": "sha512-qaMzMn1Pq0/fzQ0pGRRFBz0JnNa1pIeSDSLM/X+avW32arLBcU1QOUCGlVNohZr9P2YDmEwovgS1JXXmBvadZA==", + "license": "Apache-2.0", + "dependencies": { + "@material/web": "2.3.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.0.0", + "tslib": "^2.4.0" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.8.tgz", "integrity": "sha512-0kT3iNHHGCFy0Ow0iqXX+VPdM6nvzNmnXj3DfzfpmVGjuc1RqyLqOF5iSilDRxBNhJcuZuX4LIn2uuE5kpXCpA==", @@ -3069,7 +3357,35 @@ "tslib": "^2.6.3" } }, - "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-test-utils": { + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-menu-save": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-menu-save/-/oscd-menu-save-0.0.1.tgz", + "integrity": "sha512-g0Bl7NOflkbhAidqXSIpyjgiDr5aDernct14zkAIZI9P6zRgs1T2pTJCJddsfzgCvrdRVLKgO8NvgAozrGQ/Qw==", + "license": "Apache-2.0", + "dependencies": { + "@omicronenergy/oscd-api": "^0.1.1", + "@omicronenergy/oscd-shell": "^0.0.7", + "tslib": "^2.8.1" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-shell/-/oscd-shell-0.0.7.tgz", + "integrity": "sha512-R+QuNLyxCMy+MeQ9Vecn/4Zlw9hwBpJLEDNGsGk2oODQOCJzfB9Dl93I8nr5VD4pEbP5pDKMO5kWOHN7A277GA==", + "license": "Apache-2.0", + "dependencies": { + "@lit/localize": "^0.12.2", + "@omicronenergy/oscd-api": "^0.1.0", + "@omicronenergy/oscd-editor": "^1.5.0", + "@omicronenergy/oscd-test-utils": "^0.0.7", + "@omicronenergy/oscd-ui": "^0.0.4", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.6.3" + } + }, + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-test-utils": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.7.tgz", "integrity": "sha512-wK/t1+QBJVMT9JnOkgR6xbkB0w7Cnv7OhF0id8sS9Btv+5Bmf/5sRIi1yA9EIDEH3wtXb8vd3PiYd3LhvnawGA==", @@ -3081,57 +3397,51 @@ "tslib": "^2.4.0" } }, - "node_modules/@omicronenergy/oscd-test-utils": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.6.tgz", - "integrity": "sha512-6T+5Ara2/9aI8LXtuOe9/vpK1eh/QJPhEVBNFqXK5WvtT6+wdZXoBFoFL1u0VWnOZmNoJKZvam0Cw2+3xk1VIg==", + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.4.tgz", + "integrity": "sha512-qaMzMn1Pq0/fzQ0pGRRFBz0JnNa1pIeSDSLM/X+avW32arLBcU1QOUCGlVNohZr9P2YDmEwovgS1JXXmBvadZA==", "license": "Apache-2.0", "dependencies": { - "@omicronenergy/oscd-api": "^0.1.0", - "@open-wc/testing": "3.2.2", - "fast-check": "^3.22.0", + "@material/web": "2.3.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.0.0", "tslib": "^2.4.0" } }, - "node_modules/@omicronenergy/oscd-test-utils/node_modules/@open-wc/dedupe-mixin": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@open-wc/dedupe-mixin/-/dedupe-mixin-1.4.0.tgz", - "integrity": "sha512-Sj7gKl1TLcDbF7B6KUhtvr+1UCxdhMbNY5KxdU5IfMFWqL8oy1ZeAcCANjoB1TL0AJTcPmcCFsCbHf8X2jGDUA==", - "license": "MIT" - }, - "node_modules/@omicronenergy/oscd-test-utils/node_modules/@open-wc/scoped-elements": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@open-wc/scoped-elements/-/scoped-elements-2.2.4.tgz", - "integrity": "sha512-12X4F4QGPWcvPbxAiJ4v8wQFCOu+laZHRGfTrkoj+3JzACCtuxHG49YbuqVzQ135QPKCuhP9wA0kpGGEfUegyg==", - "license": "MIT", + "node_modules/@omicronenergy/oscd-shell/node_modules/@omicronenergy/oscd-ui": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-ui/-/oscd-ui-0.0.9.tgz", + "integrity": "sha512-ziRUJWVxm7aAMPcNVnsFQCjkYWNsKWVRdHoizKEsXz14SQJUYEMLSO9fnmwn74VIqqCWF5Y1YS0QR7v4DDK/1g==", + "license": "Apache-2.0", "dependencies": { - "@lit/reactive-element": "^1.0.0 || ^2.0.0", - "@open-wc/dedupe-mixin": "^1.4.0" + "@omicronenergy/oscd-material-web-base": "^2.4.0", + "@open-wc/scoped-elements": "^3.0.5", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", + "lit": "^3.3.0", + "tslib": "^2.8.1" } }, - "node_modules/@omicronenergy/oscd-test-utils/node_modules/@open-wc/testing": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@open-wc/testing/-/testing-3.2.2.tgz", - "integrity": "sha512-byN4dJTd6ZyI9mWmI4lVj30uiu+rYvQr93g64Pd7UFBdAUgb02DHLj6fkJ1gjxA6LC/MeFd7K7mOZ4+vKrMptw==", - "license": "MIT", + "node_modules/@omicronenergy/oscd-shell/node_modules/@openscd/oscd-api": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@openscd/oscd-api/-/oscd-api-0.1.6.tgz", + "integrity": "sha512-AqoHwQPsyiKxR8OVV3nOGgMMeiXgt2WAODZVcW0zLy7pLcZAROVzbvindiX3s09FuEOFY7UMyozmDmk1UXZJHg==", + "license": "Apache-2.0", "dependencies": { - "@esm-bundle/chai": "^4.3.4-fix.0", - "@open-wc/semantic-dom-diff": "^0.20.0", - "@open-wc/testing-helpers": "^2.3.1", - "@types/chai-dom": "^1.11.0", - "@types/sinon-chai": "^3.2.3", - "chai-a11y-axe": "^1.5.0" + "tslib": "^2.8.1" } }, - "node_modules/@omicronenergy/oscd-test-utils/node_modules/@open-wc/testing-helpers": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@open-wc/testing-helpers/-/testing-helpers-2.3.2.tgz", - "integrity": "sha512-uZMGC/C1m5EiwQsff6KMmCW25TYMQlJt4ilAWIjnelWGFg9HPUiLnlFvAas3ESUP+4OXLO8Oft7p4mHvbYvAEQ==", - "license": "MIT", + "node_modules/@omicronenergy/oscd-test-utils": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@omicronenergy/oscd-test-utils/-/oscd-test-utils-0.0.8.tgz", + "integrity": "sha512-OQprZ2PYUwfbPp7c/ZTHsOI7tZ1yv0p3+0HlClkpDLwFX2GZQzapKcXbTkFCuDYXPqmpyPcXazrz14tfANYIiQ==", + "license": "Apache-2.0", "dependencies": { - "@open-wc/scoped-elements": "^2.2.4", - "lit": "^2.0.0 || ^3.0.0", - "lit-html": "^2.0.0 || ^3.0.0" + "@omicronenergy/oscd-api": "^0.1.0", + "@open-wc/testing": "4.0.0", + "fast-check": "^3.22.0", + "tslib": "^2.4.0" } }, "node_modules/@omicronenergy/oscd-ui": { @@ -3251,11 +3561,23 @@ "lit-html": "^2.0.0 || ^3.0.0" } }, - "node_modules/@openenergytools/scl-lib": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@openenergytools/scl-lib/-/scl-lib-1.6.0.tgz", - "integrity": "sha512-LUb496VJcc/DAHM2AExJJCuAUVCj6BqY8dGMitgEEoHgfdm9kaFjED13OssCOpac7mlY8JzbLs50Ir8nOE/+hg==", - "license": "Apache-2.0" + "node_modules/@openscd/oscd-api": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@openscd/oscd-api/-/oscd-api-0.1.5.tgz", + "integrity": "sha512-SPm79bIqhSSxYMfnHIIwfuNpQa+UyJPY4Gxl6MVjHLY1jOkhevL+k/FfI4g08v3RdMG/+2MYu6ZxpB4zuQU5ZQ==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.8.1" + } + }, + "node_modules/@openscd/scl-lib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@openscd/scl-lib/-/scl-lib-2.0.0.tgz", + "integrity": "sha512-Fk3JaTELoMXpUIUbyGECbd83CfdU74sa0h0fzO5Q4qtJAQNcxf8Aba9jJcbgbz+PWz9G1m6CcWH8aZzD07g9/w==", + "license": "Apache-2.0", + "dependencies": { + "@openscd/oscd-api": "0.1.5" + } }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", @@ -3760,40 +4082,40 @@ ] }, "node_modules/@shikijs/engine-oniguruma": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.8.1.tgz", - "integrity": "sha512-KGQJZHlNY7c656qPFEQpIoqOuC4LrxjyNndRdzk5WKB/Ie87+NJCF1xo9KkOUxwxylk7rT6nhlZyTGTC4fCe1g==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.17.0.tgz", + "integrity": "sha512-flSbHZAiOZDNTrEbULY8DLWavu/TyVu/E7RChpLB4WvKX4iHMfj80C6Hi3TjIWaQtHOW0KC6kzMcuB5TO1hZ8Q==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.8.1", + "@shikijs/types": "3.17.0", "@shikijs/vscode-textmate": "^10.0.2" } }, "node_modules/@shikijs/langs": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.8.1.tgz", - "integrity": "sha512-TjOFg2Wp1w07oKnXjs0AUMb4kJvujML+fJ1C5cmEj45lhjbUXtziT1x2bPQb9Db6kmPhkG5NI2tgYW1/DzhUuQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.17.0.tgz", + "integrity": "sha512-icmur2n5Ojb+HAiQu6NEcIIJ8oWDFGGEpiqSCe43539Sabpx7Y829WR3QuUW2zjTM4l6V8Sazgb3rrHO2orEAw==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.8.1" + "@shikijs/types": "3.17.0" } }, "node_modules/@shikijs/themes": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.8.1.tgz", - "integrity": "sha512-Vu3t3BBLifc0GB0UPg2Pox1naTemrrvyZv2lkiSw3QayVV60me1ujFQwPZGgUTmwXl1yhCPW8Lieesm0CYruLQ==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.17.0.tgz", + "integrity": "sha512-/xEizMHLBmMHwtx4JuOkRf3zwhWD2bmG5BRr0IPjpcWpaq4C3mYEuTk/USAEglN0qPrTwEHwKVpSu/y2jhferA==", "dev": true, "license": "MIT", "dependencies": { - "@shikijs/types": "3.8.1" + "@shikijs/types": "3.17.0" } }, "node_modules/@shikijs/types": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.8.1.tgz", - "integrity": "sha512-5C39Q8/8r1I26suLh+5TPk1DTrbY/kn3IdWA5HdizR0FhlhD05zx5nKCqhzSfDHH3p4S0ZefxWd77DLV+8FhGg==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.17.0.tgz", + "integrity": "sha512-wjLVfutYWVUnxAjsWEob98xgyaGv0dTEnMZDruU5mRjVN7szcGOfgO+997W2yR6odp+1PtSBNeSITRRTfUzK/g==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 5dcbed1..bea618c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "oscd-editor-diff", + "name": "@omicronenergy/oscd-editor-diff", "description": "OpenSCD plugin for diffing SCL files", "version": "0.0.1", "type": "module", @@ -30,10 +30,9 @@ "lint": "eslint .", "format": "eslint . --fix", "analyze": "cem analyze --litelement --exclude demo/* --exclude dist/* --exclude *.spec.ts --exclude *.test.ts --exclude coverage/*", - "copy-demo": "cp -r ./demo ./dist/", "start": "npm run build && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wds --node-resolve \"", "start:bundle": "npm run bundle && concurrently -k -r \"rollup -c rollup.config.js --watch\" \"wds --watch \"", - "build": "rimraf dist && mkdir dist && npm run copy-demo && npm run analyze -- --exclude dist && tsc ", + "build": "rimraf dist && npm run analyze -- --exclude dist && tsc ", "bundle": "rimraf dist && rollup -c rollup.config.js", "test": "npm run build && wtr --coverage", "test:watch": "npm run build && concurrently -k -r \"tsc --watch --preserveWatchOutput\" \"wtr --watch\"", @@ -45,8 +44,9 @@ "@omicronenergy/oscd-background-editv1": "^0.0.6", "@omicronenergy/oscd-menu-open": "^0.0.6", "@omicronenergy/oscd-menu-save": "^0.0.1", - "@omicronenergy/oscd-shell": "^0.0.8", - "@openenergytools/scl-lib": "^1.2.0", + "@omicronenergy/oscd-shell": "^0.0.10", + "@openscd/scl-lib": "^2.0.0", + "@webcomponents/scoped-custom-element-registry": "^0.0.10", "lit": "^3.3.0", "tslib": "^2.8.1", "xxhash-wasm": "^1.1.0" diff --git a/util.ts b/util.ts index c5a7166..eae8079 100644 --- a/util.ts +++ b/util.ts @@ -1,4 +1,4 @@ -import { identity as sclLibIdentity } from '@openenergytools/scl-lib'; +import { identity as sclLibIdentity } from '@openscd/scl-lib'; export type fcdaDesc = { LDevice?: string | null; diff --git a/web-dev-server.config.js b/web-dev-server.config.js index 560a673..b21eab9 100644 --- a/web-dev-server.config.js +++ b/web-dev-server.config.js @@ -1,7 +1,6 @@ import { hmrPlugin, presets } from '@open-wc/dev-server-hmr'; export default /** @type {import('@web/dev-server').DevServerConfig} */ ({ - rootDir: 'dist', open: 'demo/index.html', /** Use regular watch mode if HMR is not enabled. */ watch: true,