fix: refactor to use core npm package

noraeb · noraeb · commit 8d76fda64d1f · 2025-11-17T14:27:42.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compas-open-scd/package.json b/packages/compas-open-scd/package.json
@@ -18,6 +18,8 @@
   "module": "open-scd.js",
   "type": "module",
   "dependencies": {
+    "@compas-oscd/core": "^0.1.7",
+    "@compas-oscd/xml": "^0.0.1",
     "@material/mwc-dialog": "0.22.1",
     "@material/mwc-drawer": "0.22.1",
     "@material/mwc-fab": "0.22.1",
@@ -36,17 +38,16 @@
     "@material/mwc-textarea": "0.22.1",
     "@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",
     "lit-element": "2.5.1",
     "lit-html": "1.4.1",
     "lit-translate": "^1.2.1",
     "marked": "^4.0.10",
-    "panzoom": "^9.4.2",
-    "@compas-oscd/xml": "^0.0.1",
-    "@openscd/open-scd": "*",
-    "@openscd/plugins": "*",
-    "@openscd/addons": "*"
+    "panzoom": "^9.4.2"
   },
   "scripts": {
     "lint:eslint": "eslint --ext .ts,.html . --ignore-path .gitignore",
@@ -62,7 +63,7 @@
     "test:unit": "web-test-runner --watch --group unit",
     "test:integration": "web-test-runner --watch --group integration",
     "doc:clean": "npx rimraf doc",
-    "doc:typedoc": "typedoc --plugin none --out doc src",
+    "doc:typedoc": "typedoc --entryPointStrategy expand --entryPoints ./src --exclude **/*.spec.ts --exclude **/*.test.ts --out doc",
     "doc:wca": "wca src --outDir doc/components",
     "doc": "npm run doc:clean && npm run doc:typedoc && npm run doc:wca",
     "release": "standard-version",
@@ -84,8 +85,8 @@
     "@snowpack/plugin-typescript": "^1.2.1",
     "@types/marked": "^2.0.4",
     "@types/node": "^16.6.1",
-    "@typescript-eslint/eslint-plugin": "^4.29.2",
-    "@typescript-eslint/parser": "^4.29.2",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
     "@web/dev-server-esbuild": "^0.2.16",
     "@web/test-runner": "^0.13.22",
     "concurrently": "^6.2.1",
@@ -104,9 +105,9 @@
     "source-map": "^0.7.4",
     "standard-version": "^9.3.1",
     "tslib": "^2.3.1",
-    "typedoc": "^0.21.10",
-    "typedoc-plugin-markdown": "3.10.4",
-    "typescript": "4.3.5",
+    "typedoc": "^0.24.0",
+    "typedoc-plugin-markdown": "^3.14.0",
+    "typescript": "~4.7.4",
     "web-component-analyzer": "^1.1.6",
     "workbox-cli": "^6.2.4"
   },
diff --git a/packages/compas-open-scd/src/addons/CompasHistory.ts b/packages/compas-open-scd/src/addons/CompasHistory.ts
@@ -17,7 +17,7 @@ import '@openscd/open-scd/src/filtered-list.js';
 
 import {
   IssueDetail,
-} from '@openscd/core/foundation/deprecated/history.js';
+} from '@compas-oscd/core/foundation/deprecated/history.js';
 
 import { HistoryUIDetail, OscdHistory } from '@openscd/open-scd/src/addons/History.js';
 import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
diff --git a/packages/compas-open-scd/src/compas-editors/CompasVersions.ts b/packages/compas-open-scd/src/compas-editors/CompasVersions.ts
@@ -23,8 +23,8 @@ import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
 import '@openscd/open-scd/src/plain-compare-list.js';
 
-import { newLogEvent } from "@openscd/core/foundation/deprecated/history.js";
-import { newOpenDocEvent } from "@openscd/core/foundation/deprecated/open-event.js";
+import { newLogEvent } from "@compas-oscd/core/foundation/deprecated/history.js";
+import { newOpenDocEvent } from "@compas-oscd/core/foundation/deprecated/open-event.js";
 
 import {
   newWizardEvent,
diff --git a/packages/compas-open-scd/src/compas-editors/autogen-substation.ts b/packages/compas-open-scd/src/compas-editors/autogen-substation.ts
@@ -1,9 +1,9 @@
 import { LitElement, property } from 'lit-element';
 import {
   newActionEvent,
-} from '@openscd/core/foundation/deprecated/editor.js';
+} from '@compas-oscd/core/foundation/deprecated/editor.js';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 import { get } from 'lit-translate';
 
 let cbNum = 1;
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
@@ -18,11 +18,11 @@ import '@material/mwc-icon-button';
 import { IconButton } from '@material/mwc-icon-button';
 
 import { isPublic } from '@openscd/open-scd/src/foundation.js';
-import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
+import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
-import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
+import { ComplexAction, SimpleAction } from "@compas-oscd/core/foundation/deprecated/editor.js";
 
 import '@openscd/open-scd/src/action-pane.js';
 import '@openscd/open-scd/src/action-icon.js';
diff --git a/packages/compas-open-scd/src/compas-services/Websocket.ts b/packages/compas-open-scd/src/compas-services/Websocket.ts
@@ -1,4 +1,4 @@
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 import {
   APPLICATION_ERROR,
   extractErrorMessage,
diff --git a/packages/compas-open-scd/src/compas-services/foundation.ts b/packages/compas-open-scd/src/compas-services/foundation.ts
@@ -1,5 +1,5 @@
 import { get } from 'lit-translate';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
 export const NOT_FOUND_ERROR = 'NotFoundError';
 export const APPLICATION_ERROR = 'ApplicationError';
diff --git a/packages/compas-open-scd/src/compas-wizards/scl.ts b/packages/compas-open-scd/src/compas-wizards/scl.ts
@@ -10,7 +10,7 @@ import {
 
 import { cloneElement } from '@compas-oscd/xml';
 
-import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js";
+import { ComplexAction, EditorAction } from "@compas-oscd/core/foundation/deprecated/editor.js";
 
 import '../compas/CompasLabelsField.js';
 
diff --git a/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts b/packages/compas-open-scd/src/compas/CompasAutoAlignment.ts
@@ -12,8 +12,8 @@ import '@material/mwc-list';
 import '@material/mwc-list/mwc-check-list-item';
 
 import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
 
 import { CompasSclAutoAlignmentService } from '../compas-services/CompasSclAutoAlignmentService.js';
 import { createLogEvent } from '../compas-services/foundation.js';
diff --git a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts
@@ -5,8 +5,8 @@ import '@material/mwc-list/mwc-list-item';
 import {
   newWizardEvent,
 } from '@openscd/open-scd/src/foundation.js';
-import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import '@openscd/open-scd/src/filtered-list.js';
 
diff --git a/packages/compas-open-scd/src/compas/CompasNsdoc.ts b/packages/compas-open-scd/src/compas/CompasNsdoc.ts
@@ -5,7 +5,7 @@ import {
   createNSDocLogEvent,
 } from '../compas-services/foundation.js';
 import { CompasNSDocFileService } from '../compas-services/CompasNSDocFileService.js';
-import { newLoadNsdocEvent } from '@openscd/core/foundation/deprecated/settings.js';
+import { newLoadNsdocEvent } from '@compas-oscd/core/foundation/deprecated/settings.js';
 
 interface NsdocFileResponse {
   id: string;
diff --git a/packages/compas-open-scd/src/compas/CompasOpen.ts b/packages/compas-open-scd/src/compas/CompasOpen.ts
@@ -10,7 +10,7 @@ import { translate } from 'lit-translate';
 
 import '@material/mwc-button';
 
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';
 import { createLogEvent } from '../compas-services/foundation.js';
diff --git a/packages/compas-open-scd/src/compas/CompasSave.ts b/packages/compas-open-scd/src/compas/CompasSave.ts
@@ -14,7 +14,7 @@ import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
 import '@material/mwc-textfield';
 import '@material/mwc-button';
 
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 import { saveDocumentToFile } from '../file.js';
 
 import '@openscd/open-scd/src/WizardDivider.js';
diff --git a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts
@@ -10,8 +10,8 @@ import {
   Wizard,
   WizardInputElement,
 } from '@openscd/open-scd/src/foundation.js';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import '@openscd/open-scd/src/wizard-textfield.js';
 
diff --git a/packages/compas-open-scd/src/compas/foundation.ts b/packages/compas-open-scd/src/compas/foundation.ts
@@ -1,7 +1,7 @@
 import { get } from 'lit-translate';
 
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
 import {
   COMPAS_SCL_PRIVATE_TYPE,
   getCompasSclFileType,
diff --git a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts
@@ -2,7 +2,7 @@ import {css, customElement, html, LitElement, property, TemplateResult} from 'li
 import {get, translate} from "lit-translate";
 
 import { patterns } from "@openscd/open-scd/src/foundation.js";
-import { ComplexAction } from "@openscd/core/foundation/deprecated/editor.js";
+import { ComplexAction } from "@compas-oscd/core/foundation/deprecated/editor.js";
 import {
   checkValidity,
   Wizard,
diff --git a/packages/compas-open-scd/src/locamation/foundation.ts b/packages/compas-open-scd/src/locamation/foundation.ts
@@ -8,7 +8,7 @@ import {
   WizardInputElement
 } from "@openscd/open-scd/src/foundation.js";
 import { cloneElement } from '@compas-oscd/xml';
-import { SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
+import { SimpleAction } from "@compas-oscd/core/foundation/deprecated/editor.js";
 
 
 
diff --git a/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts b/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts
@@ -1,7 +1,7 @@
 import { html, LitElement, property } from 'lit-element';
 import { get } from 'lit-translate';
 
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 import {
   newWizardEvent,
   Wizard,
diff --git a/packages/compas-open-scd/src/menu/CompasCimMapping.ts b/packages/compas-open-scd/src/menu/CompasCimMapping.ts
@@ -1,8 +1,8 @@
 import { css, html, LitElement, query, TemplateResult } from 'lit-element';
 
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 import { stripExtensionFromName } from '../compas/foundation.js';
 
 import {
diff --git a/packages/compas-open-scd/src/menu/CompasOpen.ts b/packages/compas-open-scd/src/menu/CompasOpen.ts
@@ -7,9 +7,9 @@ import { Dialog } from '@material/mwc-dialog';
 
 import {
   newLogEvent,
-} from '@openscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from "@openscd/core/foundation/deprecated/open-event.js";
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+} from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from "@compas-oscd/core/foundation/deprecated/open-event.js";
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import CompasOpenElement, { DocRetrievedEvent } from '../compas/CompasOpen.js';
 import { updateDocumentInOpenSCD } from '../compas/foundation.js';
diff --git a/packages/compas-open-scd/src/menu/CompasSave.ts b/packages/compas-open-scd/src/menu/CompasSave.ts
@@ -12,7 +12,7 @@ import '@material/mwc-button';
 import '@material/mwc-dialog';
 import { Dialog } from '@material/mwc-dialog';
 
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import CompasSaveElement from '../compas/CompasSave.js';
 
diff --git a/packages/compas-open-scd/src/menu/CompasSaveAs.ts b/packages/compas-open-scd/src/menu/CompasSaveAs.ts
@@ -12,7 +12,7 @@ import '@material/mwc-button';
 import '@material/mwc-dialog';
 import { Dialog } from '@material/mwc-dialog';
 
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import CompasSaveElement from '../compas/CompasSave.js';
 
diff --git a/packages/compas-open-scd/src/menu/CompasSaveAsVersion.ts b/packages/compas-open-scd/src/menu/CompasSaveAsVersion.ts
@@ -13,7 +13,7 @@ import '@material/mwc-button';
 import '@material/mwc-dialog';
 import { Dialog } from '@material/mwc-dialog';
 
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import CompasSaveElement from '../compas/CompasSave.js';
 import { DocRetrievedEvent } from '../compas/CompasOpen.js';
diff --git a/packages/compas-open-scd/src/open-scd.ts b/packages/compas-open-scd/src/open-scd.ts
@@ -7,8 +7,8 @@ import {
   TemplateResult,
 } from 'lit-element';
 
-import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js';
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 
 import './addons/CompasSession.js';
 import './addons/CompasHistory.js';
@@ -33,14 +33,14 @@ import {
 import { ActionDetail } from '@material/mwc-list';
 
 import { officialPlugins as builtinPlugins } from '../public/js/plugins.js';
-import type { PluginSet, Plugin as CorePlugin } from '@openscd/core';
-import { OscdApi } from '@openscd/core';
+import type { PluginSet, Plugin as CorePlugin } from '@compas-oscd/core';
+import { OscdApi } from '@compas-oscd/core';
 import { classMap } from 'lit-html/directives/class-map.js';
 import {
   newConfigurePluginEvent,
   ConfigurePluginEvent,
 } from '@openscd/open-scd/src/plugin.events.js';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 import { pluginTag } from '@openscd/open-scd/src/plugin-tag.js';
 import packageJson from '../package.json';
 import { CompasSclDataService } from './compas-services/CompasSclDataService.js';
diff --git a/packages/compas-open-scd/src/validators/CompasValidateSchema.ts b/packages/compas-open-scd/src/validators/CompasValidateSchema.ts
@@ -1,6 +1,6 @@
 import { LitElement, property } from 'lit-element';
 
-import { newIssueEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newIssueEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
 import {
   CompasSclValidatorService,
diff --git a/packages/compas-open-scd/test/unit/CompasHistoring.test.ts b/packages/compas-open-scd/test/unit/CompasHistoring.test.ts
@@ -2,7 +2,7 @@ import { expect, fixture, html } from '@open-wc/testing';
 
 import '@openscd/open-scd/test/unit/mock-logger.js';
 
-import { newIssueEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newIssueEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
 import { MockOpenSCD } from '@openscd/open-scd/test/mock-open-scd.js';
 import { OscdHistory } from '@openscd/open-scd//src/addons/History.js';
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
@@ -11,7 +11,7 @@ import {
   isDelete,
   isReplace,
   Replace,
-} from "@openscd/core/foundation/deprecated/editor.js";
+} from "@compas-oscd/core/foundation/deprecated/editor.js";
 
 import {
   Wizard,
diff --git a/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts b/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts
@@ -5,7 +5,7 @@ import {fetchDoc, setWizardTextFieldValue} from "@openscd/plugins/test/unit/wiza
 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";
-import {ComplexAction, isSimple, isReplace, Replace} from "@openscd/core/foundation/deprecated/editor.js";
+import {ComplexAction, isSimple, isReplace, Replace} from "@compas-oscd/core/foundation/deprecated/editor.js";
 
 import "@openscd/open-scd/test/mock-wizard-editor.js";
 import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
diff --git a/packages/compas-open-scd/test/unit/locamation/foundation.test.ts b/packages/compas-open-scd/test/unit/locamation/foundation.test.ts
@@ -1,6 +1,6 @@
 import {expect} from "@open-wc/testing";
 
-import {Create, isCreate, isReplace, Replace} from "@openscd/core/foundation/deprecated/editor.js";
+import {Create, isCreate, isReplace, Replace} from "@compas-oscd/core/foundation/deprecated/editor.js";
 import {initializeNsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
 
 import {
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
@@ -3,7 +3,7 @@ import { expect } from '@open-wc/testing';
 import {
   ComplexAction,
   isSimple
-} from '@openscd/core/foundation/deprecated/editor.js';
+} from '@compas-oscd/core/foundation/deprecated/editor.js';
 import {
   WizardActor,
   WizardInputElement,
diff --git a/packages/compas-open-scd/tsconfig.json b/packages/compas-open-scd/tsconfig.json
@@ -16,7 +16,17 @@
     "sourceMap": true,
     "inlineSources": true,
     "resolveJsonModule": true,
-    "rootDir": "./"
+    "rootDir": "./",
+    "paths": {
+      "@compas-oscd/core": [
+        "../../node_modules/@compas-oscd/core/dist/foundation.d.ts"
+      ],
+      "@compas-oscd/core/*": ["../../node_modules/@compas-oscd/core/dist/*"],
+      "@openscd/core": [
+        "../../node_modules/@compas-oscd/core/dist/foundation.d.ts"
+      ],
+      "@openscd/core/*": ["../../node_modules/@compas-oscd/core/dist/*"]
+    }
   },
   "include": ["**/*.ts"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';`
	`1`	`+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';`
`2`	`2`	`import {`
`3`	`3`	`APPLICATION_ERROR,`
`4`	`4`	`extractErrorMessage,`