chore: Fix more imports

openscd · Jul 18, 2024 · 9bcee42 · 9bcee42
1 parent a9d97f2
commit 9bcee42
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 53 deletions.
diff --git a/packages/compas-open-scd/src/Hosting.ts b/packages/compas-open-scd/src/Hosting.ts
@@ -15,7 +15,8 @@ import { Drawer } from '@material/mwc-drawer';
 import { ActionDetail, List } from '@material/mwc-list';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
-import { Mixin, newPendingStateEvent } from 'open-scd/src/foundation.js';
+import { Mixin } from '@openscd/open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
 import { UserInfoEvent } from './compas/foundation.js';
 import { HistoringElement } from './Historing.js';
 import { PluggingElement, Plugin, pluginIcons } from './Plugging.js';

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
@@ -17,17 +17,15 @@ import '@material/mwc-icon-button';
 
 import { IconButton } from '@material/mwc-icon-button';
 
-import {
-  ComplexAction,
-  createElement,
-  isPublic,
-  newActionEvent,
-  newLogEvent,
-  SimpleAction,
-} from 'open-scd/src/foundation.js';
+import { isPublic } from '@openscd/open-scd/src/foundation.js';
+import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
+import { createElement } from '@openscd/xml';
+import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+
+import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
 
-import 'open-scd/src/action-pane.js';
-import 'open-scd/src/action-icon.js';
+import '@openscd/open-scd/src/action-pane.js';
+import '@openscd/open-scd/src/action-icon.js';
 
 import {
   SIEMENS_SITIPE_IED_REF,
@@ -45,7 +43,7 @@ import {
 } from './sitipe-service.js';
 import { defaultNamingStrategy, NamingStrategy } from './sitipe-substation.js';
 import { get } from 'lit-translate';
-import { updateReferences } from 'open-scd/src/wizards/foundation/references.js';
+import { updateReferences } from '@openscd/plugins/src/wizards/foundation/references.js';
 
 /**
  * Transfer namespaces from one element to another

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 'open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/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 'open-scd/src/foundation.js';
+import { newLogEvent } from '@openscd/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
@@ -9,7 +9,7 @@ import {
   Wizard,
   WizardActor,
   WizardInputElement,
-} from 'open-scd/src/foundation.js';
+} from '@openscd/open-scd/src/foundation.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
@@ -11,7 +11,9 @@ import { get, translate } from 'lit-translate';
 import '@material/mwc-list';
 import '@material/mwc-list/mwc-check-list-item';
 
-import { newLogEvent, newOpenDocEvent, newWizardEvent } from 'open-scd/src/foundation.js';
+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 { CompasSclAutoAlignmentService } from '../compas-services/CompasSclAutoAlignmentService.js';
 import { createLogEvent } from '../compas-services/foundation.js';

diff --git 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 'open-scd/src/wizard-textfield.js';
+import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
 import { translate } from 'lit-translate';
 
-import 'open-scd/src/wizard-textfield.js';
+import "@openscd/open-scd/src/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
@@ -1,6 +1,6 @@
 import { property, PropertyValues, state } from 'lit-element';
 
-import { LitElementConstructor, Mixin } from 'open-scd/src/foundation.js';
+import { LitElementConstructor, Mixin } from '@openscd/open-scd/src/foundation.js';
 
 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
@@ -6,7 +6,7 @@ import {
   newOpenDocEvent,
   newPendingStateEvent,
   newWizardEvent,
-} from 'open-scd/src/foundation.js';
+} from '@openscd/open-scd/src/foundation.js';
 
 import 'open-scd/src/filtered-list.js';
 

diff --git 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 'open-scd/src/wizard-textfield.js';
+import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
 
-import 'open-scd/src/wizard-textfield.js';
+import "@openscd/open-scd/src/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
@@ -10,7 +10,7 @@ import { translate } from 'lit-translate';
 
 import '@material/mwc-button';
 
-import { newPendingStateEvent } from 'open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/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 'open-scd/src/foundation.js';
+import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
 import { saveDocumentToFile } from '../file.js';
 
 import 'open-scd/src/WizardDivider.js';

diff --git 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 'open-scd/src/foundation.js';
+import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
 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
@@ -11,7 +11,7 @@ import {
   newWizardEvent,
   Wizard,
   WizardInputElement,
-} from 'open-scd/src/foundation.js';
+} from '@openscd/open-scd/src/foundation.js';
 
 import '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,6 +1,6 @@
 import { get } from 'lit-translate';
 
-import { newLogEvent, newOpenDocEvent } from 'open-scd/src/foundation.js';
+import { newLogEvent, newOpenDocEvent } from '@openscd/open-scd/src/foundation.js';
 import {
   COMPAS_SCL_PRIVATE_TYPE,
   getCompasSclFileType,

diff --git a/packages/compas-open-scd/src/locamation/LocamationIEDList.ts b/packages/compas-open-scd/src/locamation/LocamationIEDList.ts
@@ -4,9 +4,9 @@ import {get, translate} from "lit-translate";
 import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 
-import {newSubWizardEvent, newWizardEvent, Wizard, WizardInputElement} from 'open-scd/src/foundation.js';
+import {newSubWizardEvent, newWizardEvent, Wizard, WizardInputElement} from '@openscd/open-scd/src/foundation.js';
 import {isSCLNamespace} from "open-scd/src/schemas.js";
-import {Nsdoc} from "open-scd/src/foundation/nsdoc.js";
+import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
 
 import {iedHeader, lDeviceHeader, LOCAMATION_MANUFACTURER, LOCAMATION_PRIVATE} from "./foundation.js";
 import {locamationLNListWizard} from "./LocamationLNList.js";

diff --git a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts
@@ -9,8 +9,8 @@ import {
   WizardAction,
   WizardInputElement,
   wizardInputSelector
-} from 'open-scd/src/foundation.js';
-import {Nsdoc} from "open-scd/src/foundation/nsdoc.js";
+} from '@openscd/open-scd/src/foundation.js';
+import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
 
 import 'open-scd/src/wizard-textfield.js';
 

diff --git a/packages/compas-open-scd/src/locamation/foundation.ts b/packages/compas-open-scd/src/locamation/foundation.ts
@@ -1,14 +1,16 @@
-import {Nsdoc} from "open-scd/src/foundation/nsdoc.js";
+import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
 
 import {
-  cloneElement,
   getDescriptionAttribute,
   getInstanceAttribute,
   getNameAttribute,
   getValue,
-  SimpleAction,
   WizardInputElement
-} from "open-scd/src/foundation.js";
+} from "@openscd/open-scd/src/foundation.js";
+import { cloneElement } from '@openscd/xml';
+import { SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
+
+
 
 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
@@ -6,7 +6,7 @@ import {
   newWizardEvent,
   Wizard,
   WizardInputElement,
-} from 'open-scd/src/foundation.js';
+} from '@openscd/open-scd/src/foundation.js';
 
 import CompasAutoAlignmentElement from '../compas/CompasAutoAlignment.js';
 

diff --git a/packages/compas-open-scd/src/menu/CompasCimMapping.ts b/packages/compas-open-scd/src/menu/CompasCimMapping.ts
@@ -4,7 +4,7 @@ import {
   newLogEvent,
   newOpenDocEvent,
   newPendingStateEvent,
-} from 'open-scd/src/foundation.js';
+} from '@openscd/open-scd/src/foundation.js';
 import { stripExtensionFromName } from '../compas/foundation.js';
 
 import {

diff --git a/packages/compas-open-scd/src/menu/CompasImportFromApi.ts b/packages/compas-open-scd/src/menu/CompasImportFromApi.ts
@@ -3,7 +3,7 @@ import { get } from 'lit-translate';
 
 import 'open-scd/src/filtered-list.js';
 import 'open-scd/src/wizard-textfield.js';
-import { newWizardEvent, Wizard } from 'open-scd/src/foundation.js';
+import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
 
 import '../compas/CompasImportFromApi.js';
 

diff --git 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 'open-scd/src/foundation.js';
-import { mergeWizard } from 'open-scd/src/wizards.js';
+import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
+import { mergeWizard } from '@openscd/open-scd/src/wizards.js';
 
 import { DocRetrievedEvent } from '../compas/CompasOpen.js';
 

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,
-  newOpenDocEvent,
-  newPendingStateEvent,
-} from 'open-scd/src/foundation.js';
+} 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 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 'open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/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 'open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/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 'open-scd/src/foundation.js';
+import { newPendingStateEvent } from '@openscd/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/menu/CompasSettings.ts b/packages/compas-open-scd/src/menu/CompasSettings.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from 'lit-element';
 import { get } from 'lit-translate';
 
-import { newWizardEvent, Wizard, WizardInputElement } from 'open-scd/src/foundation.js';
+import { newWizardEvent, Wizard, WizardInputElement } from "@openscd/open-scd/src/foundation.js";
 
 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
@@ -1,10 +1,10 @@
 import { html, LitElement } from 'lit-element';
 import { get } from 'lit-translate';
 
-import { newWizardEvent, Wizard } from 'open-scd/src/foundation.js';
+import { newWizardEvent, Wizard } from "@openscd/open-scd/src/foundation.js";
 
 import { DocRetrievedEvent } from '../compas/CompasOpen.js';
-import { mergeSubstation } from 'open-scd/src/menu/UpdateSubstation.js';
+import { mergeSubstation } from '@openscd/plugins/src/menu/UpdateSubstation.js';
 
 import '../compas/CompasOpen.js';
 

diff --git 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 'open-scd/src/foundation.js';
+import { compareNames } from '@openscd/open-scd/src/foundation.js';
 
 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
@@ -1,7 +1,7 @@
 import {LitElement} from 'lit-element';
 
-import {newWizardEvent} from 'open-scd/src/foundation.js';
-import {Nsdoc} from "open-scd/src/foundation/nsdoc.js";
+import {newWizardEvent} from '@openscd/open-scd/src/foundation.js';
+import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
 
 import "../locamation/LocamationIEDList.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 'open-scd/src/foundation.js';
+import { newIssueEvent } from '@openscd/core/foundation/deprecated/history.js';
 
 import {
   CompasSclValidatorService,