[REF] Link, Input: remove getters to special attributes

Author: Zynton

packages/plugin-inline/src/Format.ts

@@ -31,7 +31,7 @@ export class Format extends Modifier {
     // Public
     //--------------------------------------------------------------------------
 
-    render(): Node {
+    render(): Element {
         const node = document.createElement(this.htmlTag);
         const attributes = this.modifiers.find(Attributes);
         if (attributes) {

packages/plugin-input/src/InputHtmlDomRenderer.ts

@@ -17,6 +17,12 @@ export class InputHtmlDomRenderer extends AbstractRenderer<Node[]> {
         if (attributes) {
             this.engine.renderAttributes(Attributes, node, input);
         }
+        if (node.inputType) {
+            input.setAttribute('type', node.inputType);
+        }
+        if (node.inputName) {
+            input.setAttribute('name', node.inputName);
+        }
         input.value = node.value;
         return [input];
     }

packages/plugin-input/src/InputNode.ts

@@ -1,41 +1,13 @@
 import { VElement } from '../../core/src/VNodes/VElement';
-import { Attributes } from '../../plugin-xml/src/Attributes';
 
 export class InputNode extends VElement {
     value: string;
-    constructor(type?: string, name?: string, value?: string) {
+    inputName: string;
+    inputType: string;
+    constructor(params: { type?: string; name?: string; value?: string } = {}) {
         super({ htmlTag: 'INPUT' });
-        this.inputName = name;
-        this.inputType = type;
-        this.value = value;
-    }
-
-    //--------------------------------------------------------------------------
-    // Public
-    //--------------------------------------------------------------------------
-
-    /**
-     * Return the `name` attribute of this Input node.
-     */
-    get inputName(): string {
-        return this.modifiers.find(Attributes)?.get('name') as string;
-    }
-    /**
-     * Set the `name` attribute of this Input node.
-     */
-    set inputName(name: string) {
-        this.modifiers.find(Attributes)?.set('name', name);
-    }
-    /**
-     * Return the `type` attribute of this Input node.
-     */
-    get inputType(): string {
-        return this.modifiers.find(Attributes)?.get('type') as string;
-    }
-    /**
-     * Set the `type` attribute of this Input node.
-     */
-    set inputType(name: string) {
-        this.modifiers.find(Attributes)?.set('type', name);
+        this.inputName = params.name;
+        this.inputType = params.type;
+        this.value = params.value;
     }
 }

packages/plugin-input/src/InputXmlDomParser.ts

@@ -2,6 +2,7 @@ import { AbstractParser } from '../../plugin-parser/src/AbstractParser';
 import { XmlDomParsingEngine } from '../../plugin-xml/src/XmlDomParsingEngine';
 import { InputNode } from './InputNode';
 import { nodeName } from '../../utils/src/utils';
+import { Attributes } from '../../plugin-xml/src/Attributes';
 
 export class InputXmlDomParser extends AbstractParser<Node> {
     static id = XmlDomParsingEngine.id;
@@ -12,9 +13,17 @@ export class InputXmlDomParser extends AbstractParser<Node> {
     };
 
     async parse(item: HTMLInputElement): Promise<InputNode[]> {
-        const input = new InputNode();
+        const input = new InputNode({
+            type: item.getAttribute('type'),
+            name: item.getAttribute('name'),
+            value: item.value,
+        });
         input.modifiers.append(this.engine.parseAttributes(item));
-        input.value = item.value;
+        const attributes = input.modifiers.find(Attributes);
+        if (attributes) {
+            attributes.remove('type'); // type is on input.inputType
+            attributes.remove('name'); // type is on input.inputName
+        }
         const nodes = await this.engine.parse(...item.childNodes);
         input.append(...nodes);
         return [input];

packages/plugin-link/src/LinkFormat.ts

@@ -1,15 +1,20 @@
 import { Format } from '../../plugin-inline/src/Format';
-import { Attributes } from '../../plugin-xml/src/Attributes';
 
 export class LinkFormat extends Format {
-    constructor(url?: string) {
+    constructor(public url = '#') {
         super('A');
-        this.url = url;
     }
-    get url(): string {
-        return this.modifiers.find(Attributes)?.get('href');
-    }
-    set url(url: string) {
-        this.modifiers.get(Attributes).set('href', url);
+
+    //--------------------------------------------------------------------------
+    // Public
+    //--------------------------------------------------------------------------
+
+    /**
+     * @override
+     */
+    render(): Element {
+        const element = super.render();
+        element.setAttribute('href', this.url);
+        return element;
     }
 }

packages/plugin-link/src/LinkXmlDomParser.ts

@@ -3,6 +3,7 @@ import { XmlDomParsingEngine } from '../../plugin-xml/src/XmlDomParsingEngine';
 import { VNode } from '../../core/src/VNodes/VNode';
 import { LinkFormat } from './LinkFormat';
 import { nodeName } from '../../utils/src/utils';
+import { Attributes } from '../../plugin-xml/src/Attributes';
 
 export class LinkXmlDomParser extends FormatParser {
     static id = XmlDomParsingEngine.id;
@@ -13,8 +14,9 @@ export class LinkXmlDomParser extends FormatParser {
     };
 
     async parse(item: Element): Promise<VNode[]> {
-        const link = new LinkFormat();
+        const link = new LinkFormat(item.getAttribute('href'));
         link.modifiers.append(this.engine.parseAttributes(item));
+        link.modifiers.find(Attributes)?.remove('href'); // href is on link.url
         const children = await this.engine.parse(...item.childNodes);
         this.applyFormat(link, children);