Fixed build and processed some review comments.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

src/editors/protocol104/foundation/cdc.ts

@@ -1,7 +1,6 @@
 import {
   Create,
   getNameAttribute,
-  getTypeAttribute,
   newLogEvent,
   newWizardEvent,
 } from '../../../foundation.js';
@@ -16,6 +15,7 @@ import {
   findElementInOriginalLNStructure,
   getCdcValueFromDOElement,
   getEnumOrds,
+  getTypeAttribute,
   isEnumDataAttribute,
 } from './foundation.js';
 import { editAddressWizard } from '../wizards/address.js';
@@ -657,7 +657,7 @@ function createTemplateStructure(
   let templateStructure: Element[] | null = [doElement];
 
   const doc = doElement.ownerDocument;
-  const doType = doElement.getAttribute('type') ?? '';
+  const doType = getTypeAttribute(doElement) ?? '';
   let typeElement = doc.querySelector(`DOType[id="${doType}"]`);
 
   daPath.path.forEach(name => {
@@ -678,7 +678,7 @@ function createTemplateStructure(
 
     const bType = daElement.getAttribute('bType') ?? '';
     if (bType === 'Struct') {
-      const type = daElement.getAttribute('type') ?? '';
+      const type = getTypeAttribute(daElement) ?? '';
       typeElement = doc.querySelector(`DAType[id="${type}"]`);
     } else {
       typeElement = null;

src/editors/protocol104/foundation/foundation.ts

@@ -76,7 +76,7 @@ export function getCdcValueFromDOIElement(doiElement: Element): string | null {
 }
 
 export function getCdcValueFromDOElement(doElement: Element): string | null {
-  const doType = doElement.getAttribute('type');
+  const doType = getTypeAttribute(doElement);
   const doTypeElement = doElement.ownerDocument.querySelector(
     `DOType[id="${doType}"]`
   );
@@ -124,6 +124,16 @@ export function get104DetailsLine(
     .join(', ');
 }
 
+/**
+ * Extract the 'type' attribute from the given XML element.
+ * @param element - The element to extract instance from.
+ * @returns the value, or undefined if there is no instance.
+ */
+export function getTypeAttribute(element: Element): string | undefined {
+  const type = element.getAttribute('type');
+  return type ? type : undefined;
+}
+
 /**
  * Search for a DAI Element below the passed DOI Element.
  *
@@ -132,7 +142,7 @@ export function get104DetailsLine(
  * @returns The found DA Element or null, if not found.
  */
 export function getDaElement(doElement: Element, name: string): Element | null {
-  const doType = doElement.getAttribute('type');
+  const doType = getTypeAttribute(doElement);
   if (doType) {
     return doElement.ownerDocument.querySelector(
       `DOType[id="${doType}"] > DA[name="${name}"]`
@@ -288,7 +298,7 @@ function buildTemplateChainFromInstanceElements(
           templateChain.push(doElement);
 
           // For the next element search the DOType that is linked to the DO Element.
-          const typeId = doElement.getAttribute('type') ?? '';
+          const typeId = getTypeAttribute(doElement) ?? '';
           typeElement = doc.querySelector(`DOType[id="${typeId}"]`);
         } else {
           typeElement = null;
@@ -306,7 +316,7 @@ function buildTemplateChainFromInstanceElements(
 
           if (daElement.getAttribute('bType') === 'Struct') {
             // Only if the bType is a struct we need to search for the DAType for the next element.
-            const typeId = element.getAttribute('type') ?? '';
+            const typeId = getTypeAttribute(element) ?? '';
             typeElement = doc.querySelector(`DAType[id="${typeId}"]`);
           } else {
             typeElement = null;
@@ -373,7 +383,7 @@ export function isEnumDataAttribute(daiElement: Element): boolean {
 export function getEnumVal(daiElement: Element, ord: string): string | null {
   const daElement = getDaElementByDaiElement(daiElement);
   if (isEnumType(daElement)) {
-    const enumType = daElement!.getAttribute('type');
+    const enumType = getTypeAttribute(daElement!);
     const enumVal = daiElement.ownerDocument.querySelector(
       `EnumType[id="${enumType}"] > EnumVal[ord="${ord}"]`
     );
@@ -393,7 +403,7 @@ export function getEnumOrds(daiElement: Element): string[] {
   const ords: string[] = [];
   const daElement = getDaElementByDaiElement(daiElement);
   if (isEnumType(daElement)) {
-    const enumType = daElement!.getAttribute('type');
+    const enumType = getTypeAttribute(daElement!);
     const enumVals = daiElement.ownerDocument.querySelectorAll(
       `EnumType[id="${enumType}"] > EnumVal`
     );

src/editors/protocol104/foundation/p-types.ts

@@ -6,7 +6,7 @@ export const pTypes104: string[] = [
   'TIMEOUT-0',
   'TIMEOUT-1',
   'TIMEOUT-2',
-  'TIMEOUT-3'
+  'TIMEOUT-3',
 ];
 
 export const pTypesRedundancyGroup104: string[] = [
@@ -15,18 +15,16 @@ export const pTypesRedundancyGroup104: string[] = [
   'TIMEOUT-0',
   'TIMEOUT-1',
   'TIMEOUT-2',
-  'TIMEOUT-3'
+  'TIMEOUT-3',
 ];
 
-export const pTypesLogicLink104: string[] = [
-  'IP',
-  'IP-SUBNET'
-];
+export const pTypesLogicLink104: string[] = ['IP', 'IP-SUBNET'];
 
 const typeBase = {
   IP: '([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]([0-9]{1,2}|1[0-9]{2}|2[0-4][0-9]|25[0-5])',
-  factor: '[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-3][0-2][0-7][0-6][0-7]',
-  timeout: '[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]'
+  factor:
+    '[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-3][0-2][0-7][0-6][0-7]',
+  timeout: '[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]',
 };
 
 /** Patterns from IEC 61850-80-1 for all `P` elements */
@@ -38,22 +36,22 @@ export const typePattern: Partial<Record<string, string>> = {
   'TIMEOUT-0': typeBase.timeout,
   'TIMEOUT-1': typeBase.timeout,
   'TIMEOUT-2': typeBase.timeout,
-  'TIMEOUT-3': typeBase.timeout
+  'TIMEOUT-3': typeBase.timeout,
 };
 
 export const stationTypeOptions: string[] = [
   'controlling-station',
-  'controlled-station'
-]
+  'controlled-station',
+];
 
 export const typeDescriptiveNameKeys: Record<string, string> = {
-  'StationType': 'protocol104.network.connectedAp.wizard.stationTypeHelper',
-  'IP': 'protocol104.network.connectedAp.wizard.ipHelper',
+  StationType: 'protocol104.network.connectedAp.wizard.stationTypeHelper',
+  IP: 'protocol104.network.connectedAp.wizard.ipHelper',
   'IP-SUBNET': 'protocol104.network.connectedAp.wizard.ipSubnetHelper',
   'W-FACTOR': 'protocol104.network.connectedAp.wizard.wFactorHelper',
   'K-FACTOR': 'protocol104.network.connectedAp.wizard.kFactorHelper',
   'TIMEOUT-0': 'protocol104.network.connectedAp.wizard.timeout0Helper',
   'TIMEOUT-1': 'protocol104.network.connectedAp.wizard.timeout1Helper',
   'TIMEOUT-2': 'protocol104.network.connectedAp.wizard.timeout2Helper',
   'TIMEOUT-3': 'protocol104.network.connectedAp.wizard.timeout3Helper',
-};
+};

src/editors/protocol104/network-container.ts

@@ -10,14 +10,15 @@ import {
 } from '../../foundation.js';
 import { createSubNetworkWizard } from './wizards/subnetwork.js';
 import { Base104Container } from './base-container.js';
+import { getTypeAttribute } from './foundation/foundation.js';
 
 @customElement('network-104-container')
 export class Network104Container extends Base104Container {
   private getSubNetworkElements(): Element[] {
     return Array.from(
       this.doc.querySelectorAll('Communication > SubNetwork') ?? []
     )
-      .filter(network => network.getAttribute('type') === '104')
+      .filter(network => getTypeAttribute(network) === '104')
       .sort((a, b) => compareNames(a, b));
   }
 

src/editors/protocol104/subnetwork-container.ts

@@ -13,6 +13,7 @@ import { compareNames, newWizardEvent } from '../../foundation.js';
 import { translate } from 'lit-translate';
 import { createConnectedApWizard } from './wizards/connectedap.js';
 import { Base104Container } from './base-container.js';
+import { getTypeAttribute } from './foundation/foundation.js';
 
 /** [[`104`]] subeditor for a `SubNetwork` element. */
 @customElement('subnetwork-104-container')
@@ -60,7 +61,7 @@ export class SubNetwork104Container extends Base104Container {
   }
 
   private subNetworkSpecs(): string {
-    const type = this.element.getAttribute('type') ?? null;
+    const type = getTypeAttribute(this.element) ?? null;
 
     if (!type && !this.bitrate) return '';