Merge branch 'fix/migrate-to-npm-package-core' into fix/migrate-to-npm-package-openscd

noraeb · noraeb · commit 8bc67fd2e325 · 2025-11-25T12:49:24.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,7 +18,7 @@
   "module": "open-scd.js",
   "type": "module",
   "dependencies": {
-    "@compas-oscd/core": "^0.1.7",
+    "@compas-oscd/core": "^0.1.21",
     "@compas-oscd/open-scd": "^0.34.32",
     "@compas-oscd/xml": "^0.0.1",
     "@material/mwc-dialog": "0.22.1",
diff --git a/packages/compas-open-scd/src/addons/CompasHistory.ts b/packages/compas-open-scd/src/addons/CompasHistory.ts
@@ -17,6 +17,7 @@ import {
   HistoryUIDetail,
   OscdHistory,
 } from '@compas-oscd/open-scd/addons/History.js';
+
 import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
 import { newWizardEvent, SCLTag } from '@compas-oscd/open-scd/foundation';
 import { nothing } from 'lit-html';
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 '@compas-oscd/open-scd/plain-compare-list.js';
 
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newLogEvent } from '@compas-oscd/core';
+import { newOpenDocEvent } from '@compas-oscd/core';
 
 import { newWizardEvent, Wizard } from '@compas-oscd/open-scd/foundation.js';
 
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,7 @@
 import { LitElement, property } from 'lit-element';
-import {
-  newActionEvent,
-} from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { newActionEvent } from '@compas-oscd/core';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core';
 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,14 +18,11 @@ import '@material/mwc-icon-button';
 import { IconButton } from '@material/mwc-icon-button';
 
 import { isPublic } from '@compas-oscd/open-scd/foundation.js';
-import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { newActionEvent } from '@compas-oscd/core';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core';
 
-import {
-  ComplexAction,
-  SimpleAction,
-} from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { ComplexAction, SimpleAction } from '@compas-oscd/core';
 
 import '@compas-oscd/open-scd/action-pane.js';
 import '@compas-oscd/open-scd/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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 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 '@compas-oscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core';
 
 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,10 +10,7 @@ import {
 
 import { cloneElement } from '@compas-oscd/xml';
 
-import {
-  ComplexAction,
-  EditorAction,
-} from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { ComplexAction, EditorAction } from '@compas-oscd/core';
 
 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 '@compas-oscd/open-scd/foundation.js';
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newLogEvent } from '@compas-oscd/core';
+import { newOpenDocEvent } from '@compas-oscd/core';
 
 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
@@ -2,9 +2,9 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element';
 
 import '@material/mwc-list/mwc-list-item';
 
-import { newWizardEvent } from '@compas-oscd/open-scd/foundation.js';
-import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
-import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newWizardEvent } from '@compas-oscd/open-scd/src/foundation.js';
+import { newOpenDocEvent } from '@compas-oscd/core';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 import '@compas-oscd/open-scd/filtered-list.js';
 
diff --git a/packages/compas-open-scd/src/compas/CompasNsdoc.ts b/packages/compas-open-scd/src/compas/CompasNsdoc.ts
@@ -1,11 +1,9 @@
-
-
 import {
   createLogEvent,
   createNSDocLogEvent,
 } from '../compas-services/foundation.js';
 import { CompasNSDocFileService } from '../compas-services/CompasNSDocFileService.js';
-import { newLoadNsdocEvent } from '@compas-oscd/core/foundation/deprecated/settings.js';
+import { newLoadNsdocEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core';
 import { saveDocumentToFile } from '../file.js';
 
 import '@compas-oscd/open-scd/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 '@compas-oscd/open-scd/foundation.js';
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
-import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newLogEvent } from '@compas-oscd/core';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 import '@compas-oscd/open-scd/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 '@compas-oscd/core/foundation/deprecated/history.js';
-import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
+import { newLogEvent } from '@compas-oscd/core';
+import { newOpenDocEvent } from '@compas-oscd/core';
 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
@@ -9,7 +9,7 @@ import {
 import { get, translate } from 'lit-translate';
 
 import { patterns } from '@compas-oscd/open-scd/foundation.js';
-import { ComplexAction } from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { ComplexAction } from '@compas-oscd/core';
 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 '@compas-oscd/open-scd/foundation.js';
 import { cloneElement } from '@compas-oscd/xml';
-import { SimpleAction } from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { SimpleAction } from '@compas-oscd/core';
 
 export const LOCAMATION_MANUFACTURER = 'Locamation B.V.';
 export const LOCAMATION_PRIVATE = 'LCMTN_VMU_SENSOR';
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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 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 '@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 { newLogEvent } from '@compas-oscd/core';
+import { newOpenDocEvent } from '@compas-oscd/core';
+import { newPendingStateEvent } from '@compas-oscd/core';
 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
@@ -5,11 +5,9 @@ import '@material/mwc-button';
 import '@material/mwc-dialog';
 import { Dialog } from '@material/mwc-dialog';
 
-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 { newLogEvent } from '@compas-oscd/core';
+import { newOpenDocEvent } from '@compas-oscd/core';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 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 '@compas-oscd/core/foundation/deprecated/open-event.js';
-import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
+import { newOpenDocEvent } from '@compas-oscd/core';
+import { newPendingStateEvent } from '@compas-oscd/core';
 
 import './addons/CompasSession.js';
 import './addons/CompasHistory.js';
@@ -40,8 +40,8 @@ import {
   newConfigurePluginEvent,
   ConfigurePluginEvent,
 } from '@compas-oscd/open-scd/plugin.events.js';
-import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 import { pluginTag } from '@compas-oscd/open-scd/plugin-tag.js';
+import { newLogEvent } from '@compas-oscd/core';
 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/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 '@compas-oscd/core/foundation/deprecated/history.js';
+import { newIssueEvent } from '@compas-oscd/core';
 
 import {
   CompasSclValidatorService,
diff --git a/packages/compas-open-scd/test/unit/CompasHistoring.test.ts b/packages/compas-open-scd/test/unit/CompasHistoring.test.ts
@@ -1,6 +1,8 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import { newIssueEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import '@openscd/open-scd/test/unit/mock-logger.js';
+
+import { newIssueEvent } from '@compas-oscd/core';
 
 import { OscdHistory } from '@compas-oscd/open-scd/addons/History.js';
 import { MockOpenSCD } from '../mock-open-scd';
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
@@ -10,7 +10,7 @@ import {
   isDelete,
   isReplace,
   Replace,
-} from '@compas-oscd/core/foundation/deprecated/editor.js';
+} from '@compas-oscd/core';
 
 import {
   Wizard,
diff --git a/packages/compas-open-scd/test/unit/compas/CompasSclDataServiceResponses.ts b/packages/compas-open-scd/test/unit/compas/CompasSclDataServiceResponses.ts
@@ -81,13 +81,15 @@ export function stubFetchResponseFunction(
   listElementName: string,
   callback: (result: Element[]) => any
 ): SinonStub<any[], void> {
-  return sinon.stub(element, functionName).callsFake((...args: any[]): void => {
+  const stub = sinon.stub(element, functionName).callsFake((): void => {
     if (response) {
       const parser = new DOMParser();
       const document = parser.parseFromString(response, 'text/xml');
       callback(Array.from(document.querySelectorAll(listElementName) ?? []));
     } else {
       callback([]);
     }
-  }) as SinonStub<any[], void>;
+    return;
+  });
+  return stub as SinonStub<any[], void>;
 }
diff --git a/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts b/packages/compas-open-scd/test/unit/locamation/LocamationLNEdit.test.ts
@@ -11,12 +11,7 @@ import {
 } from '@compas-oscd/open-scd/foundation/nsdoc.js';
 import { WizardTextField } from '@compas-oscd/open-scd/dist/wizard-textfield.js';
 import { WizardAction } from '@compas-oscd/open-scd/foundation.js';
-import {
-  ComplexAction,
-  isSimple,
-  isReplace,
-  Replace,
-} from '@compas-oscd/core/foundation/deprecated/editor.js';
+import { ComplexAction, isSimple, isReplace, Replace } from '@compas-oscd/core';
 
 import '../../mock-wizard-editor.js';
 import { newWizardEvent } from '@compas-oscd/open-scd/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
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

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