@node-projects/web-component-designer 0.0.95 → 0.0.96

package/dist/elements/services/htmlWriterService/FormatingHtmlWriterService.d.ts

@@ -1,22 +1,22 @@
-import { IDesignItem } from '../../item/IDesignItem.js';
-import { IHtmlWriterService } from './IHtmlWriterService.js';
-import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
-import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
-import { IStringPosition } from './IStringPosition.js';
-declare enum ElementContainerType {
-    block = 0,
-    complex = 1
-}
-export declare class FormatingHtmlWriterService implements IHtmlWriterService {
-    private writeAttributes;
-    private writeStyles;
-    private _writeTextNode;
-    private _writeCommentNode;
-    private _writeElementNode;
-    private _writeDesignItemList;
-    private _writeNewlineAndIntend;
-    private _writeInternal;
-    getContainerType(element: HTMLElement): ElementContainerType;
-    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
-}
-export {};
+import { IDesignItem } from '../../item/IDesignItem.js';
+import { IHtmlWriterService } from './IHtmlWriterService.js';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
+import { IStringPosition } from './IStringPosition.js';
+declare enum ElementContainerType {
+    block = 0,
+    complex = 1
+}
+export declare class FormatingHtmlWriterService implements IHtmlWriterService {
+    private writeAttributes;
+    private writeStyles;
+    private _writeTextNode;
+    private _writeCommentNode;
+    private _writeElementNode;
+    private _writeDesignItemList;
+    private _writeNewlineAndIntend;
+    private _writeInternal;
+    getContainerType(element: HTMLElement): ElementContainerType;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+}
+export {};

package/dist/elements/services/htmlWriterService/FormatingHtmlWriterService.js

@@ -1,133 +1,133 @@
-import { DomConverter } from '../../widgets/designerView/DomConverter.js';
-import { CssCombiner } from '../../helper/CssCombiner.js';
-import { NodeType } from '../../item/NodeType.js';
-import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper.js';
-import { ElementDisplayType, getElementDisplaytype } from '../../helper/ElementHelper.js';
-var ElementContainerType;
-(function (ElementContainerType) {
-    ElementContainerType[ElementContainerType["block"] = 0] = "block";
-    ElementContainerType[ElementContainerType["complex"] = 1] = "complex";
-})(ElementContainerType || (ElementContainerType = {}));
-// const defaultDisplayNoneContainerDisplayType: ElementContainerType = ElementContainerType.complex;
-export class FormatingHtmlWriterService {
-    writeAttributes(writeContext, designItem) {
-        if (designItem.hasAttributes) {
-            for (const a of designItem.attributes) {
-                writeContext.indentedTextWriter.write(' ');
-                if (typeof a[1] === 'string') {
-                    if (a[1] === "")
-                        writeContext.indentedTextWriter.write(a[0]);
-                    else
-                        writeContext.indentedTextWriter.write(a[0] + '="' + DomConverter.normalizeAttributeValue(a[1]) + '"');
-                }
-                else if (!a[1])
-                    writeContext.indentedTextWriter.write(a[0]);
-                else {
-                }
-            }
-        }
-    }
-    writeStyles(writeContext, designItem) {
-        if (designItem.hasStyles) {
-            writeContext.indentedTextWriter.write(' style="');
-            let styles = designItem.styles;
-            if (writeContext.options.compressCssToShorthandProperties)
-                styles = CssCombiner.combine(styles);
-            for (const s of styles) {
-                if (s[0]) {
-                    writeContext.indentedTextWriter.write(PropertiesHelper.camelToDashCase(s[0]) + ':' + DomConverter.normalizeAttributeValue(s[1]) + ';');
-                }
-            }
-            writeContext.indentedTextWriter.write('"');
-        }
-    }
-    _writeTextNode(writeContext, designItem) {
-        writeContext.lastElementDisplayType = ElementDisplayType.inline;
-        let content = DomConverter.normalizeContentValue(designItem.content).trim();
-        if (content) {
-            writeContext.indentedTextWriter.write(content);
-        }
-    }
-    _writeCommentNode(writeContext, designItem) {
-        writeContext.indentedTextWriter.write('<!--' + designItem.content + '-->');
-    }
-    _writeElementNode(writeContext, designItem) {
-        //    const cs = getComputedStyle(designItem.element);
-        //cs.whiteSpace === 'pre'
-        //isInPre
-        //is in inline?
-        const currentElementDisplayType = getElementDisplaytype(designItem.element);
-        writeContext.lastElementDisplayType = currentElementDisplayType;
-        writeContext.indentedTextWriter.write('<' + designItem.name);
-        this.writeAttributes(writeContext, designItem);
-        this.writeStyles(writeContext, designItem);
-        writeContext.indentedTextWriter.write('>');
-        let contentSingleTextNode = false;
-        if (designItem.hasChildren) {
-            const children = designItem.children();
-            contentSingleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
-            if (contentSingleTextNode) {
-                this._writeInternal(writeContext, designItem.firstChild);
-            }
-            else {
-                let previousContainerDisplayType = writeContext.containerDisplayType;
-                writeContext.containerDisplayType = this.getContainerType(designItem.element);
-                writeContext.indentedTextWriter.levelRaise();
-                this._writeDesignItemList(currentElementDisplayType, writeContext, children);
-                writeContext.indentedTextWriter.levelShrink();
-                writeContext.containerDisplayType = previousContainerDisplayType;
-            }
-        }
-        else if (designItem.hasContent) {
-            writeContext.indentedTextWriter.write(DomConverter.normalizeContentValue(designItem.content));
-        }
-        if (!DomConverter.IsSelfClosingElement(designItem.name)) {
-            if (currentElementDisplayType === ElementDisplayType.block && designItem.hasChildren && !contentSingleTextNode) {
-                this._writeNewlineAndIntend(writeContext);
-            }
-            //write newline & intend ???
-            writeContext.indentedTextWriter.write('</' + designItem.name + '>');
-            if (currentElementDisplayType !== ElementDisplayType.none) {
-                writeContext.lastElementDisplayType = currentElementDisplayType;
-            }
-        }
-    }
-    _writeDesignItemList(currentElementDisplayType, writeContext, children) {
-        for (const c of children) {
-            if (writeContext.lastElementDisplayType == null) {
-                //first entry, do nothing
-            }
-            else if (writeContext.containerDisplayType === ElementContainerType.complex)
-                this._writeNewlineAndIntend(writeContext);
-            else if (writeContext.lastElementDisplayType !== ElementDisplayType.inline /*|| currentElementDisplayType !== ElementDisplayType.inline*/)
-                this._writeNewlineAndIntend(writeContext);
-            this._writeInternal(writeContext, c);
-        }
-    }
-    _writeNewlineAndIntend(writeContext) {
-        writeContext.indentedTextWriter.writeNewline();
-        writeContext.indentedTextWriter.writeIndent();
-    }
-    _writeInternal(writeContext, designItem) {
-        const start = writeContext.indentedTextWriter.position;
-        if (designItem.nodeType === NodeType.TextNode)
-            this._writeTextNode(writeContext, designItem);
-        else if (designItem.nodeType === NodeType.Comment)
-            this._writeCommentNode(writeContext, designItem);
-        else if (designItem.nodeType === NodeType.Element)
-            this._writeElementNode(writeContext, designItem);
-        if (writeContext.designItemsAssignmentList) {
-            writeContext.designItemsAssignmentList.set(designItem, { start: start, length: writeContext.indentedTextWriter.position - start - 1 });
-        }
-    }
-    getContainerType(element) {
-        const display = window.getComputedStyle(element).display;
-        if (display === 'block' || display === "inline-block" || display == '')
-            return ElementContainerType.block;
-        return ElementContainerType.complex;
-    }
-    write(indentedTextWriter, designItems, rootContainerKeepInline, options, designItemsAssignmentList) {
-        const context = { indentedTextWriter, options, lastElementDisplayType: null, containerDisplayType: ElementContainerType.block, designItemsAssignmentList };
-        this._writeDesignItemList(ElementDisplayType.inline, context, designItems);
-    }
-}
+import { DomConverter } from '../../widgets/designerView/DomConverter.js';
+import { CssCombiner } from '../../helper/CssCombiner.js';
+import { NodeType } from '../../item/NodeType.js';
+import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper.js';
+import { ElementDisplayType, getElementDisplaytype } from '../../helper/ElementHelper.js';
+var ElementContainerType;
+(function (ElementContainerType) {
+    ElementContainerType[ElementContainerType["block"] = 0] = "block";
+    ElementContainerType[ElementContainerType["complex"] = 1] = "complex";
+})(ElementContainerType || (ElementContainerType = {}));
+// const defaultDisplayNoneContainerDisplayType: ElementContainerType = ElementContainerType.complex;
+export class FormatingHtmlWriterService {
+    writeAttributes(writeContext, designItem) {
+        if (designItem.hasAttributes) {
+            for (const a of designItem.attributes) {
+                writeContext.indentedTextWriter.write(' ');
+                if (typeof a[1] === 'string') {
+                    if (a[1] === "")
+                        writeContext.indentedTextWriter.write(a[0]);
+                    else
+                        writeContext.indentedTextWriter.write(a[0] + '="' + DomConverter.normalizeAttributeValue(a[1]) + '"');
+                }
+                else if (!a[1])
+                    writeContext.indentedTextWriter.write(a[0]);
+                else {
+                }
+            }
+        }
+    }
+    writeStyles(writeContext, designItem) {
+        if (designItem.hasStyles) {
+            writeContext.indentedTextWriter.write(' style="');
+            let styles = designItem.styles;
+            if (writeContext.options.compressCssToShorthandProperties)
+                styles = CssCombiner.combine(styles);
+            for (const s of styles) {
+                if (s[0]) {
+                    writeContext.indentedTextWriter.write(PropertiesHelper.camelToDashCase(s[0]) + ':' + DomConverter.normalizeAttributeValue(s[1]) + ';');
+                }
+            }
+            writeContext.indentedTextWriter.write('"');
+        }
+    }
+    _writeTextNode(writeContext, designItem) {
+        writeContext.lastElementDisplayType = ElementDisplayType.inline;
+        let content = DomConverter.normalizeContentValue(designItem.content).trim();
+        if (content) {
+            writeContext.indentedTextWriter.write(content);
+        }
+    }
+    _writeCommentNode(writeContext, designItem) {
+        writeContext.indentedTextWriter.write('<!--' + designItem.content + '-->');
+    }
+    _writeElementNode(writeContext, designItem) {
+        //    const cs = getComputedStyle(designItem.element);
+        //cs.whiteSpace === 'pre'
+        //isInPre
+        //is in inline?
+        const currentElementDisplayType = getElementDisplaytype(designItem.element);
+        writeContext.lastElementDisplayType = currentElementDisplayType;
+        writeContext.indentedTextWriter.write('<' + designItem.name);
+        this.writeAttributes(writeContext, designItem);
+        this.writeStyles(writeContext, designItem);
+        writeContext.indentedTextWriter.write('>');
+        let contentSingleTextNode = false;
+        if (designItem.hasChildren) {
+            const children = designItem.children();
+            contentSingleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
+            if (contentSingleTextNode) {
+                this._writeInternal(writeContext, designItem.firstChild);
+            }
+            else {
+                let previousContainerDisplayType = writeContext.containerDisplayType;
+                writeContext.containerDisplayType = this.getContainerType(designItem.element);
+                writeContext.indentedTextWriter.levelRaise();
+                this._writeDesignItemList(currentElementDisplayType, writeContext, children);
+                writeContext.indentedTextWriter.levelShrink();
+                writeContext.containerDisplayType = previousContainerDisplayType;
+            }
+        }
+        else if (designItem.hasContent) {
+            writeContext.indentedTextWriter.write(DomConverter.normalizeContentValue(designItem.content));
+        }
+        if (!DomConverter.IsSelfClosingElement(designItem.name)) {
+            if (currentElementDisplayType === ElementDisplayType.block && designItem.hasChildren && !contentSingleTextNode) {
+                this._writeNewlineAndIntend(writeContext);
+            }
+            //write newline & intend ???
+            writeContext.indentedTextWriter.write('</' + designItem.name + '>');
+            if (currentElementDisplayType !== ElementDisplayType.none) {
+                writeContext.lastElementDisplayType = currentElementDisplayType;
+            }
+        }
+    }
+    _writeDesignItemList(currentElementDisplayType, writeContext, children) {
+        for (const c of children) {
+            if (writeContext.lastElementDisplayType == null) {
+                //first entry, do nothing
+            }
+            else if (writeContext.containerDisplayType === ElementContainerType.complex)
+                this._writeNewlineAndIntend(writeContext);
+            else if (writeContext.lastElementDisplayType !== ElementDisplayType.inline /*|| currentElementDisplayType !== ElementDisplayType.inline*/)
+                this._writeNewlineAndIntend(writeContext);
+            this._writeInternal(writeContext, c);
+        }
+    }
+    _writeNewlineAndIntend(writeContext) {
+        writeContext.indentedTextWriter.writeNewline();
+        writeContext.indentedTextWriter.writeIndent();
+    }
+    _writeInternal(writeContext, designItem) {
+        const start = writeContext.indentedTextWriter.position;
+        if (designItem.nodeType === NodeType.TextNode)
+            this._writeTextNode(writeContext, designItem);
+        else if (designItem.nodeType === NodeType.Comment)
+            this._writeCommentNode(writeContext, designItem);
+        else if (designItem.nodeType === NodeType.Element)
+            this._writeElementNode(writeContext, designItem);
+        if (writeContext.designItemsAssignmentList) {
+            writeContext.designItemsAssignmentList.set(designItem, { start: start, length: writeContext.indentedTextWriter.position - start - 1 });
+        }
+    }
+    getContainerType(element) {
+        const display = window.getComputedStyle(element).display;
+        if (display === 'block' || display === "inline-block" || display == '')
+            return ElementContainerType.block;
+        return ElementContainerType.complex;
+    }
+    write(indentedTextWriter, designItems, rootContainerKeepInline, options, designItemsAssignmentList) {
+        const context = { indentedTextWriter, options, lastElementDisplayType: null, containerDisplayType: ElementContainerType.block, designItemsAssignmentList };
+        this._writeDesignItemList(ElementDisplayType.inline, context, designItems);
+    }
+}

package/dist/elements/services/htmlWriterService/HtmlWriterService copy.d.ts

@@ -0,0 +1,12 @@
+import { IDesignItem } from '../../item/IDesignItem';
+import { IHtmlWriterService } from './IHtmlWriterService';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter';
+import { IStringPosition } from './IStringPosition';
+export declare class HtmlWriterService implements IHtmlWriterService {
+    private _conditionalyWriteIndent;
+    private _conditionalyWriteNewline;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    private internalWrite;
+    private writeTextNode;
+}

package/dist/elements/services/htmlWriterService/HtmlWriterService copy.js

@@ -0,0 +1,118 @@
+import { DomConverter } from '../../widgets/designerView/DomConverter';
+import { CssCombiner } from '../../helper/CssCombiner';
+import { NodeType } from '../../item/NodeType';
+import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper';
+import { isEmptyTextNode, isInline } from '../../helper/ElementHelper.js';
+export class HtmlWriterService {
+    _conditionalyWriteIndent(indentedTextWriter, designItem) {
+        if ((designItem.element instanceof HTMLElement && !isInline(designItem.element)) ||
+            (designItem.element.previousElementSibling instanceof HTMLElement && !isInline(designItem.element.previousElementSibling)) ||
+            (designItem.element.previousElementSibling == null && !isInline(designItem.element.parentElement) && (designItem.element.previousSibling == null || isEmptyTextNode(designItem.element.previousSibling))))
+            indentedTextWriter.writeIndent();
+    }
+    _conditionalyWriteNewline(indentedTextWriter, designItem) {
+        if ((designItem.element instanceof HTMLElement && !isInline(designItem.element)) ||
+            (designItem.element.nextElementSibling instanceof HTMLElement && !isInline(designItem.element.nextElementSibling)))
+            indentedTextWriter.writeNewline();
+    }
+    write(indentedTextWriter, designItems, rootContainerKeepInline, options, designItemsAssignmentList) {
+        for (const d of designItems) {
+            this.internalWrite(indentedTextWriter, d, options, designItemsAssignmentList);
+        }
+    }
+    internalWrite(indentedTextWriter, designItem, options, designItemsAssignmentList) {
+        let start = indentedTextWriter.position;
+        if (designItem.nodeType == NodeType.TextNode) {
+            if (isEmptyTextNode(designItem.element) &&
+                ((designItem.element.previousSibling instanceof HTMLElement && !isInline(designItem.element.previousSibling)) ||
+                    (designItem.element.nextSibling instanceof HTMLElement && !isInline(designItem.element.nextSibling)))) {
+            }
+            else
+                this.writeTextNode(indentedTextWriter, designItem, true);
+        }
+        else if (designItem.nodeType == NodeType.Comment) {
+            this._conditionalyWriteIndent(indentedTextWriter, designItem);
+            indentedTextWriter.write('<!--' + designItem.content + '-->');
+            this._conditionalyWriteNewline(indentedTextWriter, designItem);
+        }
+        else {
+            this._conditionalyWriteIndent(indentedTextWriter, designItem);
+            indentedTextWriter.write('<' + designItem.name);
+            if (designItem.hasAttributes) {
+                for (const a of designItem.attributes) {
+                    indentedTextWriter.write(' ');
+                    if (typeof a[1] === 'string') {
+                        if (a[1] === "")
+                            indentedTextWriter.write(a[0]);
+                        else
+                            indentedTextWriter.write(a[0] + '="' + DomConverter.normalizeAttributeValue(a[1]) + '"');
+                    }
+                    else if (!a[1])
+                        indentedTextWriter.write(a[0]);
+                    else {
+                        //TODO: writing of bindings
+                    }
+                }
+            }
+            if (designItem.hasStyles) {
+                indentedTextWriter.write(' style="');
+                let styles = designItem.styles;
+                if (options.compressCssToShorthandProperties)
+                    styles = CssCombiner.combine(styles);
+                for (const s of styles) {
+                    if (s[0]) {
+                        indentedTextWriter.write(PropertiesHelper.camelToDashCase(s[0]) + ':' + DomConverter.normalizeAttributeValue(s[1]) + ';');
+                    }
+                }
+                indentedTextWriter.write('"');
+            }
+            indentedTextWriter.write('>');
+            let contentSingleTextNode = false;
+            if (designItem.hasChildren) {
+                const children = designItem.children();
+                contentSingleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
+                if (contentSingleTextNode) {
+                    this.writeTextNode(indentedTextWriter, designItem, false);
+                }
+                else {
+                    if (designItem.element instanceof HTMLElement && !isInline(designItem.element)) {
+                        indentedTextWriter.writeNewline();
+                        indentedTextWriter.levelRaise();
+                    }
+                    for (const c of children) {
+                        this.internalWrite(indentedTextWriter, c, options, designItemsAssignmentList);
+                        let childSingleTextNode = c.childCount === 1 && c.firstChild.nodeType === NodeType.TextNode;
+                        if (childSingleTextNode)
+                            indentedTextWriter.writeNewline();
+                    }
+                    if (designItem.element instanceof HTMLElement && !isInline(designItem.element)) {
+                        indentedTextWriter.levelShrink();
+                        if (!indentedTextWriter.isLastCharNewline())
+                            indentedTextWriter.writeNewline();
+                        indentedTextWriter.writeIndent();
+                    }
+                }
+            }
+            else if (designItem.hasContent) {
+                indentedTextWriter.write(DomConverter.normalizeContentValue(designItem.content));
+            }
+            if (!DomConverter.IsSelfClosingElement(designItem.name))
+                indentedTextWriter.write('</' + designItem.name + '>');
+            if (!contentSingleTextNode)
+                this._conditionalyWriteNewline(indentedTextWriter, designItem);
+        }
+        if (designItemsAssignmentList) {
+            designItemsAssignmentList.set(designItem, { start: start, length: indentedTextWriter.position - start - 1 });
+        }
+    }
+    writeTextNode(indentedTextWriter, designItem, indentAndNewline) {
+        let content = DomConverter.normalizeContentValue(designItem.content).trim();
+        if (content) {
+            if (indentAndNewline)
+                this._conditionalyWriteIndent(indentedTextWriter, designItem);
+            indentedTextWriter.write(content);
+            if (indentAndNewline)
+                this._conditionalyWriteNewline(indentedTextWriter, designItem);
+        }
+    }
+}

package/dist/elements/services/htmlWriterService/HtmlWriterService.d.ts

@@ -1,12 +1,12 @@
-import { IDesignItem } from '../../item/IDesignItem.js';
-import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
-import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
-import { IStringPosition } from './IStringPosition.js';
-import { AbstractHtmlWriterService } from './AbstractHtmlWriterService.js';
-export declare class HtmlWriterService extends AbstractHtmlWriterService {
-    private _conditionalyWriteIndent;
-    private _conditionalyWriteNewline;
-    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
-    private internalWrite;
-    private writeTextNode;
-}
+import { IDesignItem } from '../../item/IDesignItem.js';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
+import { IStringPosition } from './IStringPosition.js';
+import { AbstractHtmlWriterService } from './AbstractHtmlWriterService.js';
+export declare class HtmlWriterService extends AbstractHtmlWriterService {
+    private _conditionalyWriteIndent;
+    private _conditionalyWriteNewline;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    private internalWrite;
+    private writeTextNode;
+}