Skip to content

Commit 6de8ac5

Browse files
noraebnoraeb
committed
refactor: migrate @openscd/xml to @compas-oscd/xml npm package
Signed-off-by: Nora Blomaard <[email protected]>
1 parent c151f83 commit 6de8ac5

File tree

107 files changed

+5104
-9093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+5104
-9093
lines changed

‎package-lock.json‎

Lines changed: 4937 additions & 6756 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/compas-open-scd/src/compas-editors/autogen-substation.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { LitElement, property } from 'lit-element';
2-
import {
3-
newActionEvent,
4-
} from '@openscd/core/foundation/deprecated/editor.js';
5-
import { createElement } from '@openscd/xml';
2+
import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
3+
import { createElement } from '@compas-oscd/xml';
64
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
75
import { get } from 'lit-translate';
86

‎packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ import { IconButton } from '@material/mwc-icon-button';
1919

2020
import { isPublic } from '@openscd/open-scd/src/foundation.js';
2121
import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
22-
import { createElement } from '@openscd/xml';
22+
import { createElement } from '@compas-oscd/xml';
2323
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
2424

25-
import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
25+
import {
26+
ComplexAction,
27+
SimpleAction,
28+
} from '@openscd/core/foundation/deprecated/editor.js';
2629

2730
import '@openscd/open-scd/src/action-pane.js';
2831
import '@openscd/open-scd/src/action-icon.js';

‎packages/compas-open-scd/src/compas-wizards/scl.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ import {
88
WizardInputElement,
99
} from '@openscd/open-scd/src/foundation.js';
1010

11-
import { cloneElement } from '@openscd/xml';
11+
import { cloneElement } from '@compas-oscd/xml';
1212

13-
import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js";
13+
import {
14+
ComplexAction,
15+
EditorAction,
16+
} from '@openscd/core/foundation/deprecated/editor.js';
1417

1518
import '../compas/CompasLabelsField.js';
1619

‎packages/compas-open-scd/src/locamation/foundation.ts‎

Lines changed: 61 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js";
1+
import { Nsdoc } from '@openscd/open-scd/src/foundation/nsdoc.js';
22

33
import {
44
getDescriptionAttribute,
55
getInstanceAttribute,
66
getNameAttribute,
77
getValue,
8-
WizardInputElement
9-
} from "@openscd/open-scd/src/foundation.js";
10-
import { cloneElement } from '@openscd/xml';
11-
import { SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
8+
WizardInputElement,
9+
} from '@openscd/open-scd/src/foundation.js';
10+
import { cloneElement } from '@compas-oscd/xml';
11+
import { SimpleAction } from '@openscd/core/foundation/deprecated/editor.js';
1212

13-
14-
15-
export const LOCAMATION_MANUFACTURER = "Locamation B.V.";
16-
export const LOCAMATION_PRIVATE = "LCMTN_VMU_SENSOR";
17-
export const LOCAMATION_NS = "https://www.locamation.com/61850/VMU/SCL";
18-
export const LOCAMATION_PREFIX = "lcmtn_ext";
13+
export const LOCAMATION_MANUFACTURER = 'Locamation B.V.';
14+
export const LOCAMATION_PRIVATE = 'LCMTN_VMU_SENSOR';
15+
export const LOCAMATION_NS = 'https://www.locamation.com/61850/VMU/SCL';
16+
export const LOCAMATION_PREFIX = 'lcmtn_ext';
1917

2018
export function lnHeader(ln: Element, nsDoc: Nsdoc): string {
2119
const prefix = ln.getAttribute('prefix');
2220
const inst = getInstanceAttribute(ln);
2321

2422
const data = nsDoc.getDataDescription(ln);
2523

26-
return `${prefix != null ? `${prefix} - ` : ``}${data.label}${inst ? ` - ${inst}` : ``}`;
24+
return `${prefix != null ? `${prefix} - ` : ``}${data.label}${
25+
inst ? ` - ${inst}` : ``
26+
}`;
2727
}
2828

2929
export function lDeviceHeader(lDevice: Element): string {
@@ -40,70 +40,99 @@ export function iedHeader(ied: Element): string {
4040
return `${name}${desc ? ' (' + desc + ')' : ''}`;
4141
}
4242

43-
44-
export function getInputFieldValue(inputs: WizardInputElement[], id: string): string | null {
43+
export function getInputFieldValue(
44+
inputs: WizardInputElement[],
45+
id: string
46+
): string | null {
4547
return getValue(inputs.find(i => i.id === id)!);
4648
}
4749

48-
export function inputFieldChanged(inputs: WizardInputElement[], id: string, oldValue: string | null): boolean {
50+
export function inputFieldChanged(
51+
inputs: WizardInputElement[],
52+
id: string,
53+
oldValue: string | null
54+
): boolean {
4955
const value = getInputFieldValue(inputs, id);
5056
if (oldValue) {
5157
return value !== oldValue;
5258
}
5359
return value !== null;
5460
}
5561

56-
5762
export function addPrefixAndNamespaceToDocument(element: Element): void {
5863
const rootElement = element.ownerDocument.firstElementChild!;
5964
if (!rootElement.hasAttribute('xmlns:' + LOCAMATION_PREFIX)) {
60-
rootElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + LOCAMATION_PREFIX, LOCAMATION_NS);
65+
rootElement.setAttributeNS(
66+
'http://www.w3.org/2000/xmlns/',
67+
'xmlns:' + LOCAMATION_PREFIX,
68+
LOCAMATION_NS
69+
);
6170
}
6271
}
6372

6473
export function getPrivate(element: Element): Element | null {
6574
return element.querySelector(`Private[type="${LOCAMATION_PRIVATE}"]`)!;
6675
}
6776

68-
export function createEditorAction(locamationPrivate: Element | null, fieldType: string, value: string | null): SimpleAction[] {
77+
export function createEditorAction(
78+
locamationPrivate: Element | null,
79+
fieldType: string,
80+
value: string | null
81+
): SimpleAction[] {
6982
if (locamationPrivate) {
70-
let privateField = Array.from(locamationPrivate.querySelectorAll(`P[type="${fieldType}"]`))
83+
let privateField = Array.from(
84+
locamationPrivate.querySelectorAll(`P[type="${fieldType}"]`)
85+
)
7186
.filter(element => element.namespaceURI === LOCAMATION_NS)
7287
.pop();
7388
if (!privateField) {
7489
// Make sure the namespace is configured on the root element with the known prefix.
7590
addPrefixAndNamespaceToDocument(locamationPrivate);
7691

77-
privateField = locamationPrivate.ownerDocument.createElementNS(LOCAMATION_NS, "P");
78-
privateField.setAttribute("type", fieldType);
92+
privateField = locamationPrivate.ownerDocument.createElementNS(
93+
LOCAMATION_NS,
94+
'P'
95+
);
96+
privateField.setAttribute('type', fieldType);
7997
privateField.textContent = value;
80-
return [{new: {parent: locamationPrivate, element: privateField}}];
98+
return [{ new: { parent: locamationPrivate, element: privateField } }];
8199
}
82100

83101
if (privateField.textContent !== value) {
84102
const newPrivateField = cloneElement(privateField, {});
85103
newPrivateField.textContent = value;
86-
return [{old: {element: privateField}, new: {element: newPrivateField}}];
104+
return [
105+
{ old: { element: privateField }, new: { element: newPrivateField } },
106+
];
87107
}
88108
}
89109
return [];
90110
}
91111

92-
export function hasPrivateElement(locamationPrivate: Element | null, type: string): boolean {
112+
export function hasPrivateElement(
113+
locamationPrivate: Element | null,
114+
type: string
115+
): boolean {
93116
if (locamationPrivate) {
94-
return Array.from(locamationPrivate.querySelectorAll(`P[type="${type}"]`))
95-
.filter(element => element.namespaceURI === LOCAMATION_NS)
96-
.pop() !== undefined;
117+
return (
118+
Array.from(locamationPrivate.querySelectorAll(`P[type="${type}"]`))
119+
.filter(element => element.namespaceURI === LOCAMATION_NS)
120+
.pop() !== undefined
121+
);
97122
}
98123
return false;
99124
}
100125

101-
export function getPrivateTextValue(locamationPrivate: Element | null, type: string): string | null {
126+
export function getPrivateTextValue(
127+
locamationPrivate: Element | null,
128+
type: string
129+
): string | null {
102130
if (locamationPrivate) {
103-
const privateElement =
104-
Array.from(locamationPrivate.querySelectorAll(`P[type="${type}"]`))
105-
.filter(element => element.namespaceURI === LOCAMATION_NS)
106-
.pop();
131+
const privateElement = Array.from(
132+
locamationPrivate.querySelectorAll(`P[type="${type}"]`)
133+
)
134+
.filter(element => element.namespaceURI === LOCAMATION_NS)
135+
.pop();
107136
if (privateElement) {
108137
return privateElement.textContent;
109138
}

‎packages/openscd/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"@material/mwc-textarea": "0.22.1",
4040
"@material/mwc-textfield": "0.22.1",
4141
"@material/mwc-top-app-bar-fixed": "0.22.1",
42+
"@compas-oscd/xml": "^0.0.1",
4243
"@openscd/core": "*",
43-
"@openscd/xml": "*",
4444
"ace-custom-element": "^1.6.5",
4545
"lit": "^2.2.7",
4646
"lit-translate": "^1.2.1",

‎packages/openscd/src/foundation.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Select } from '@material/mwc-select';
66
import { TextField } from '@material/mwc-textfield';
77
import AceEditor from 'ace-custom-element';
88

9-
import { getChildElementsByTagName } from '@openscd/xml';
9+
import { getChildElementsByTagName } from '@compas-oscd/xml';
1010

1111
import { WizardTextField } from './wizard-textfield.js';
1212
import { WizardSelect } from './wizard-select.js';
@@ -360,7 +360,9 @@ function lNodeSelector(tagName: SCLTag, identity: string): string {
360360
return crossProduct(
361361
parentSelectors,
362362
['>'],
363-
[`${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"][lnInst="${lnInst}"]`]
363+
[
364+
`${tagName}[iedName="None"][lnClass="${lnClass}"][lnType="${lnType}"][lnInst="${lnInst}"]`,
365+
]
364366
)
365367
.map(strings => strings.join(''))
366368
.join(',');

‎packages/openscd/src/wizard-dialog.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { IconButton } from '@material/mwc-icon-button';
2222
import { List } from '@material/mwc-list';
2323
import { Menu } from '@material/mwc-menu';
2424

25-
import { formatXml } from '@openscd/xml';
25+
import { formatXml } from '@compas-oscd/xml';
2626

2727
import 'ace-custom-element';
2828
import './wizard-checkbox.js';
@@ -296,19 +296,18 @@ export class WizardDialog extends LitElement {
296296
renderPage(page: WizardPage, index: number): TemplateResult {
297297
const isProMode = localStorage.getItem('mode') === 'pro';
298298
const hasPageElement = Boolean(page.element);
299-
const showCodeToggleButton = hasPageElement && isProMode
299+
const showCodeToggleButton = hasPageElement && isProMode;
300300

301301
let extraWidth = 0;
302302

303-
if(showCodeToggleButton && page.menuActions){
303+
if (showCodeToggleButton && page.menuActions) {
304304
extraWidth = 96;
305-
}else if(showCodeToggleButton || page.menuActions){
305+
} else if (showCodeToggleButton || page.menuActions) {
306306
extraWidth = 48;
307-
}else{
307+
} else {
308308
extraWidth = 0;
309309
}
310310

311-
312311
return html`<mwc-dialog
313312
defaultAction="next"
314313
heading=${page.title}

‎packages/plugins/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"@material/mwc-textarea": "0.22.1",
3131
"@material/mwc-textfield": "0.22.1",
3232
"@openenergytools/scl-lib": "^1.8.0",
33+
"@compas-oscd/xml": "^0.0.1",
3334
"@openscd/core": "*",
3435
"@openscd/open-scd": "*",
3536
"@openscd/wizards": "*",
36-
"@openscd/xml": "*",
3737
"lit": "^2.2.7",
3838
"lit-translate": "^1.2.1",
3939
"marked": "^4.0.10",

‎packages/plugins/src/editors/Communication.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import '@material/mwc-fab';
66
import './communication/subnetwork-editor.js';
77
import { newWizardEvent, isPublic } from '@openscd/open-scd/src/foundation.js';
88

9-
import { createElement } from '@openscd/xml';
9+
import { createElement } from '@compas-oscd/xml';
1010

1111
import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
1212
import { createSubNetworkWizard } from '../wizards/subnetwork.js';

0 commit comments

Comments
 (0)