refactor(foundation): change reference to Node instead Element (#262)

JakobVogelsang · web-flow · commit b2d48263dac5 · 2021-07-21T12:51:19.000+02:00
diff --git a/src/editors/communication/connectedap-editor.ts b/src/editors/communication/connectedap-editor.ts
@@ -210,14 +210,14 @@ export function editConnectedApAction(parent: Element): WizardActor {
         old: {
           parent,
           element: oldAddress,
-          reference: oldAddress.nextElementSibling,
+          reference: oldAddress.nextSibling,
         },
       });
       complexAction.actions.push({
         new: {
           parent,
           element: newAddress,
-          reference: oldAddress.nextElementSibling,
+          reference: oldAddress.nextSibling,
         },
       });
     } else if (oldAddress === null)
@@ -292,7 +292,7 @@ export class ConnectedAPEditor extends LitElement {
           old: {
             parent: this.element.parentElement!,
             element: this.element,
-            reference: this.element.nextElementSibling,
+            reference: this.element.nextSibling,
           },
         })
       );
diff --git a/src/editors/communication/subnetwork-editor.ts b/src/editors/communication/subnetwork-editor.ts
@@ -60,7 +60,7 @@ function getBitRateAction(
       old: {
         parent: SubNetwork,
         element: oldBitRate,
-        reference: oldBitRate.nextElementSibling,
+        reference: oldBitRate.nextSibling,
       },
     };
 
@@ -297,7 +297,7 @@ export class SubNetworkEditor extends LitElement {
           old: {
             parent: this.element.parentElement!,
             element: this.element,
-            reference: this.element.nextElementSibling,
+            reference: this.element.nextSibling,
           },
         })
       );
diff --git a/src/editors/substation/bay-editor.ts b/src/editors/substation/bay-editor.ts
@@ -53,7 +53,7 @@ export class BayEditor extends LitElement {
           old: {
             parent: this.element.parentElement!,
             element: this.element,
-            reference: this.element.nextElementSibling,
+            reference: this.element.nextSibling,
           },
         })
       );
diff --git a/src/editors/substation/conducting-equipment-editor.ts b/src/editors/substation/conducting-equipment-editor.ts
@@ -49,7 +49,7 @@ export class ConductingEquipmentEditor extends LitElement {
           old: {
             parent: this.element.parentElement!,
             element: this.element,
-            reference: this.element.nextElementSibling,
+            reference: this.element.nextSibling,
           },
         })
       );
diff --git a/src/editors/substation/foundation.ts b/src/editors/substation/foundation.ts
@@ -80,7 +80,7 @@ export function cloneElement(editor: BayEditor | VoltageLevelEditor): void {
       new: {
         parent: parent,
         element: clone,
-        reference: element.nextElementSibling,
+        reference: element.nextSibling,
       },
     })
   );
@@ -146,7 +146,7 @@ export function startMove<E extends ElementEditor, P extends ElementEditor>(
           old: {
             element: editor.element,
             parent: editor.element.parentElement!,
-            reference: editor.element.nextElementSibling,
+            reference: editor.element.nextSibling,
           },
           new: destination,
         })
diff --git a/src/editors/substation/substation-editor.ts b/src/editors/substation/substation-editor.ts
@@ -57,7 +57,7 @@ export class SubstationEditor extends LitElement {
         old: {
           parent: this.element.parentElement!,
           element: this.element,
-          reference: this.element.nextElementSibling,
+          reference: this.element.nextSibling,
         },
       })
     );
diff --git a/src/editors/substation/voltage-level-editor.ts b/src/editors/substation/voltage-level-editor.ts
@@ -62,7 +62,7 @@ export class VoltageLevelEditor extends LitElement {
           old: {
             parent: this.element.parentElement!,
             element: this.element,
-            reference: this.element.nextElementSibling,
+            reference: this.element.nextSibling,
           },
         })
       );
diff --git a/src/editors/templates/datype-wizards.ts b/src/editors/templates/datype-wizards.ts
@@ -173,7 +173,7 @@ function bDAWizard(options: WizardOptions): Wizard | undefined {
                 old: {
                   parent: bda.parentElement!,
                   element: bda,
-                  reference: bda.nextElementSibling,
+                  reference: bda.nextSibling,
                 },
               })
             );
@@ -333,7 +333,7 @@ export function dATypeWizard(
                 old: {
                   parent: datype.parentElement!,
                   element: datype,
-                  reference: datype.nextElementSibling,
+                  reference: datype.nextSibling,
                 },
               })
             );
diff --git a/src/editors/templates/dotype-wizards.ts b/src/editors/templates/dotype-wizards.ts
@@ -121,7 +121,7 @@ function sDOWizard(options: WizardOptions): Wizard | undefined {
                 old: {
                   parent: sdo.parentElement!,
                   element: sdo,
-                  reference: sdo.nextElementSibling,
+                  reference: sdo.nextSibling,
                 },
               })
             );
@@ -322,7 +322,7 @@ function dAWizard(options: WizardOptions): Wizard | undefined {
                 old: {
                   parent: da.parentElement!,
                   element: da,
-                  reference: da.nextElementSibling,
+                  reference: da.nextSibling,
                 },
               })
             );
@@ -620,7 +620,7 @@ export function dOTypeWizard(
                 old: {
                   parent: dotype.parentElement!,
                   element: dotype,
-                  reference: dotype.nextElementSibling,
+                  reference: dotype.nextSibling,
                 },
               })
             );
diff --git a/src/editors/templates/enumtype-wizard.ts b/src/editors/templates/enumtype-wizard.ts
@@ -119,7 +119,7 @@ function eNumValWizard(options: WizardOptions): Wizard {
                 old: {
                   parent: enumval.parentElement!,
                   element: enumval,
-                  reference: enumval.nextElementSibling,
+                  reference: enumval.nextSibling,
                 },
               })
             );
@@ -286,7 +286,7 @@ export function eNumTypeEditWizard(
                 old: {
                   parent: enumtype.parentElement!,
                   element: enumtype,
-                  reference: enumtype.nextElementSibling,
+                  reference: enumtype.nextSibling,
                 },
               })
             );
diff --git a/src/editors/templates/lnodetype-wizard.ts b/src/editors/templates/lnodetype-wizard.ts
@@ -147,7 +147,7 @@ function dOWizard(options: WizardOptions): Wizard | undefined {
                 old: {
                   parent: DO.parentElement!,
                   element: DO,
-                  reference: DO.nextElementSibling,
+                  reference: DO.nextSibling,
                 },
               })
             );
@@ -576,7 +576,7 @@ export function lNodeTypeWizard(
                 old: {
                   parent: lnodetype.parentElement!,
                   element: lnodetype,
-                  reference: lnodetype.nextElementSibling,
+                  reference: lnodetype.nextSibling,
                 },
               })
             );
diff --git a/src/foundation.ts b/src/foundation.ts
@@ -18,20 +18,20 @@ export type ComplexAction = {
 export type EditorAction = SimpleAction | ComplexAction;
 /** Inserts `new.element` to `new.parent` before `new.reference`. */
 export interface Create {
-  new: { parent: Element; element: Element; reference: Element | null };
+  new: { parent: Element; element: Element; reference: Node | null };
   derived?: boolean;
   checkValidity?: () => boolean;
 }
 /** Removes `old.element` from `old.parent` before `old.reference`. */
 export interface Delete {
-  old: { parent: Element; element: Element; reference: Element | null };
+  old: { parent: Element; element: Element; reference: Node | null };
   derived?: boolean;
   checkValidity?: () => boolean;
 }
 /** Reparents of `old.element` to `new.parent` before `new.reference`. */
 export interface Move {
-  old: { parent: Element; element: Element; reference: Element | null };
-  new: { parent: Element; reference: Element | null };
+  old: { parent: Element; element: Element; reference: Node | null };
+  new: { parent: Element; reference: Node | null };
   derived?: boolean;
   checkValidity?: () => boolean;
 }
diff --git a/src/menu/CommunicationMapping.ts b/src/menu/CommunicationMapping.ts
@@ -433,7 +433,7 @@ function disconnectExtRefs(extRefs: Element[]): EditorAction[] {
         old: {
           parent: extRef.parentElement!,
           element: extRef,
-          reference: extRef.nextElementSibling,
+          reference: extRef.nextSibling,
         },
       });
     }
@@ -483,7 +483,7 @@ function disconnectExtRefs(extRefs: Element[]): EditorAction[] {
         old: {
           parent: iedName.parentElement!,
           element: iedName,
-          reference: iedName.nextElementSibling,
+          reference: iedName.nextSibling,
         },
       });
   });
@@ -545,7 +545,7 @@ function disconnect(
         old: {
           parent: clientLN.parentElement!,
           element: clientLN,
-          reference: clientLN.nextElementSibling,
+          reference: clientLN.nextSibling,
         },
       });
     });
diff --git a/src/wizard-dialog.ts b/src/wizard-dialog.ts
@@ -45,7 +45,7 @@ function codeAction(element: Element): WizardActor {
     if (!text || !element.parentElement) return [];
     const desc = {
       parent: element.parentElement!,
-      reference: element.nextElementSibling,
+      reference: element.nextSibling,
       element,
     };
     const del: Delete = {
diff --git a/src/wizards.ts b/src/wizards.ts
@@ -78,7 +78,7 @@ function mergeWizardAction(
             old: {
               parent,
               element: diff.ours,
-              reference: diff.ours.nextElementSibling,
+              reference: diff.ours.nextSibling,
             },
           });
         else {
diff --git a/src/wizards/voltagelevel.ts b/src/wizards/voltagelevel.ts
@@ -165,7 +165,7 @@ function getVoltageAction(
       old: {
         parent: voltageLevel,
         element: oldVoltage,
-        reference: oldVoltage.nextElementSibling,
+        reference: oldVoltage.nextSibling,
       },
     };
 
diff --git a/test/unit/Editing.test.ts b/test/unit/Editing.test.ts
@@ -9,7 +9,7 @@ describe('EditingElement', () => {
   let elm: EditingElement;
   let parent: Element;
   let element: Element;
-  let reference: Element | null;
+  let reference: Node | null;
 
   beforeEach(async () => {
     const doc = mockSCD();
@@ -19,7 +19,7 @@ describe('EditingElement', () => {
 
     parent = elm.doc!.querySelector('parent1')!;
     element = parent.querySelector('child1')!;
-    reference = element.nextElementSibling;
+    reference = element.nextSibling;
   });
 
   it('creates an element on receiving a Create Action', () => {
