Skip to content

Commit 7d58cb6

Browse files
noraebnoraeb
committed
Revert "refactor: migrate @openscd/xml to @compas-oscd/xml npm package"
This reverts commit 6de8ac5.
1 parent 6de8ac5 commit 7d58cb6

File tree

107 files changed

+9661
-5672
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

+9661
-5672
lines changed

‎package-lock.json‎

Lines changed: 7324 additions & 5505 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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { LitElement, property } from 'lit-element';
2-
import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
3-
import { createElement } from '@compas-oscd/xml';
2+
import {
3+
newActionEvent,
4+
} from '@openscd/core/foundation/deprecated/editor.js';
5+
import { createElement } from '@openscd/xml';
46
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
57
import { get } from 'lit-translate';
68

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,10 @@ 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 '@compas-oscd/xml';
22+
import { createElement } from '@openscd/xml';
2323
import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
2424

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

3027
import '@openscd/open-scd/src/action-pane.js';
3128
import '@openscd/open-scd/src/action-icon.js';

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

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

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

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

1815
import '../compas/CompasLabelsField.js';
1916

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

Lines changed: 32 additions & 61 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 '@compas-oscd/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 '@openscd/xml';
11+
import { SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
1212

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';
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";
1719

1820
export function lnHeader(ln: Element, nsDoc: Nsdoc): string {
1921
const prefix = ln.getAttribute('prefix');
2022
const inst = getInstanceAttribute(ln);
2123

2224
const data = nsDoc.getDataDescription(ln);
2325

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

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

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

50-
export function inputFieldChanged(
51-
inputs: WizardInputElement[],
52-
id: string,
53-
oldValue: string | null
54-
): boolean {
48+
export function inputFieldChanged(inputs: WizardInputElement[], id: string, oldValue: string | null): boolean {
5549
const value = getInputFieldValue(inputs, id);
5650
if (oldValue) {
5751
return value !== oldValue;
5852
}
5953
return value !== null;
6054
}
6155

56+
6257
export function addPrefixAndNamespaceToDocument(element: Element): void {
6358
const rootElement = element.ownerDocument.firstElementChild!;
6459
if (!rootElement.hasAttribute('xmlns:' + LOCAMATION_PREFIX)) {
65-
rootElement.setAttributeNS(
66-
'http://www.w3.org/2000/xmlns/',
67-
'xmlns:' + LOCAMATION_PREFIX,
68-
LOCAMATION_NS
69-
);
60+
rootElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + LOCAMATION_PREFIX, LOCAMATION_NS);
7061
}
7162
}
7263

7364
export function getPrivate(element: Element): Element | null {
7465
return element.querySelector(`Private[type="${LOCAMATION_PRIVATE}"]`)!;
7566
}
7667

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

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

10183
if (privateField.textContent !== value) {
10284
const newPrivateField = cloneElement(privateField, {});
10385
newPrivateField.textContent = value;
104-
return [
105-
{ old: { element: privateField }, new: { element: newPrivateField } },
106-
];
86+
return [{old: {element: privateField}, new: {element: newPrivateField}}];
10787
}
10888
}
10989
return [];
11090
}
11191

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

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

‎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",
4342
"@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: 2 additions & 4 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 '@compas-oscd/xml';
9+
import { getChildElementsByTagName } from '@openscd/xml';
1010

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

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

Lines changed: 6 additions & 5 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 '@compas-oscd/xml';
25+
import { formatXml } from '@openscd/xml';
2626

2727
import 'ace-custom-element';
2828
import './wizard-checkbox.js';
@@ -296,18 +296,19 @@ 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+
311312
return html`<mwc-dialog
312313
defaultAction="next"
313314
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",
3433
"@openscd/core": "*",
3534
"@openscd/open-scd": "*",
3635
"@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 '@compas-oscd/xml';
9+
import { createElement } from '@openscd/xml';
1010

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

0 commit comments

Comments
 (0)