xmlui 0.4.1 → 0.4.2-beta.2

package/dist/scripts/{src → xmlui/src}/parsers/xmlui-parser/transform.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPrefixRegex = exports.UCRegex = exports.COMPOUND_COMP_ID = void 0;
 exports.nodeToComponentDef = nodeToComponentDef;
 const syntax_kind_1 = require("./syntax-kind");
-const ParserError_1 = require("../ueml/ParserError");
+const ParserError_1 = require("./ParserError");
 const Parser_1 = require("../scripting/Parser");
 const code_behind_collect_1 = require("../scripting/code-behind-collect");
-const BindingTreeEvaluationContext_1 = require("../../components-core/script-runner/BindingTreeEvaluationContext");
 const CharacterCodes_1 = require("./CharacterCodes");
 exports.COMPOUND_COMP_ID = "Component";
 exports.UCRegex = /^[A-Z]/;
@@ -14,7 +13,7 @@ exports.onPrefixRegex = /^on[A-Z]/;
 const propAttrs = ["name", "value"];
 const CDATA_PREFIX_LEN = 9;
 const CDATA_POSTFIX_LEN = 3;
-function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
+function nodeToComponentDef(node, originalGetText, fileId, moduleResolver = () => "") {
     const getText = (node) => {
         var _a;
         return (_a = node.text) !== null && _a !== void 0 ? _a : originalGetText(node);
@@ -73,13 +72,15 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
             }
             const children = getChildNodes(node);
             // --- Check for nested component
-            const nestedCompound = children.find((child) => child.kind === syntax_kind_1.SyntaxKind.ElementNode && getTagName(child) === exports.COMPOUND_COMP_ID);
+            const nestedCompound = children.find((child) => child.kind === syntax_kind_1.SyntaxKind.ElementNode &&
+                getTagName(child) === exports.COMPOUND_COMP_ID);
             if (nestedCompound) {
                 reportError("T006");
                 return null;
             }
             // --- Get the single component definition
-            const nestedComponents = children.filter((child) => child.kind === syntax_kind_1.SyntaxKind.ElementNode && exports.UCRegex.test(getTagName(child)));
+            const nestedComponents = children.filter((child) => child.kind === syntax_kind_1.SyntaxKind.ElementNode &&
+                exports.UCRegex.test(getTagName(child)));
             if (nestedComponents.length === 0) {
                 nestedComponents.push(createTextNodeElement(""));
             }
@@ -96,38 +97,39 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                     }
                 }
             }
-            // --- Should we use a Fragment?
+            // --- Should we wrap with a Fragment?
+            let element;
             if (nestedComponents.length > 1 || nestedVars.length > 0) {
-                // --- Wrap the children in a Fragment
-                const fragmentElement = wrapWithFragment([...nestedVars, ...nestedComponents]);
-                const nestedFragment = transformSingleElement(usesStack, fragmentElement);
-                component = {
-                    name: compoundName.value,
-                    component: nestedFragment,
-                };
-                if (api) {
-                    component.api = api;
-                }
-                if (vars) {
-                    nestedFragment.vars = Object.assign(Object.assign({}, nestedFragment.vars), vars);
-                }
+                element = wrapWithFragment([...nestedVars, ...nestedComponents]);
             }
             else {
-                // --- Search for the element, take a note of the preceding comment
-                const element = nestedComponents[0];
-                const nestedComponent = transformSingleElement(usesStack, element);
-                // --- Create the component
-                component = {
-                    name: compoundName.value,
-                    component: nestedComponent,
-                };
-                if (api) {
-                    component.api = api;
-                }
-                if (vars) {
-                    nestedComponent.vars = Object.assign(Object.assign({}, nestedComponent.vars), vars);
-                }
-            }
+                element = nestedComponents[0];
+            }
+            let nestedComponent = transformSingleElement(usesStack, element);
+            component = {
+                name: compoundName.value,
+                component: nestedComponent,
+                debug: {
+                    source: {
+                        start: node.start,
+                        end: node.end,
+                        fileId,
+                    },
+                },
+            };
+            if (api) {
+                component.api = api;
+            }
+            if (vars) {
+                nestedComponent.vars = Object.assign(Object.assign({}, nestedComponent.vars), vars);
+            }
+            nestedComponent.debug = {
+                source: {
+                    start: element.start,
+                    end: element.end,
+                    fileId,
+                },
+            };
             const nodeClone = withNewChildNodes(node, childrenToCollect);
             collectTraits(usesStack, component, nodeClone);
             return component;
@@ -139,6 +141,13 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
         }
         component = {
             type: name,
+            debug: {
+                source: {
+                    start: node.start,
+                    end: node.end,
+                    fileId,
+                },
+            },
         };
         // --- Done
         collectTraits(usesStack, component, node);
@@ -176,7 +185,9 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                 return;
             }
             const childName = getTagName(child);
-            if (isCompound && child.kind === syntax_kind_1.SyntaxKind.ElementNode && exports.UCRegex.test(childName)) {
+            if (isCompound &&
+                child.kind === syntax_kind_1.SyntaxKind.ElementNode &&
+                exports.UCRegex.test(childName)) {
                 // --- This is the single nested component definition of a compound component,
                 // --- it is already processed
                 return;
@@ -191,6 +202,7 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
             // --- Element name starts with an uppercase letter
             if (exports.UCRegex.test(childName) && !isCompound) {
                 // --- This must be a child component
+                // maybe here or in the transformSingleElement function, after the compound comp check
                 const childComponent = transformSingleElement(usesStack, child);
                 if (childComponent) {
                     if (!comp.children) {
@@ -267,8 +279,7 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
         try {
             // --- We parse the module file to catch parsing errors
             parser.parseStatements();
-            const evalContext = (0, BindingTreeEvaluationContext_1.createEvalContext)({});
-            comp.scriptCollected = (0, code_behind_collect_1.collectCodeBehindFromSource)("Main", comp.script, moduleResolver, evalContext);
+            comp.scriptCollected = (0, code_behind_collect_1.collectCodeBehindFromSource)("Main", comp.script, moduleResolver);
         }
         catch (err) {
             if (parser.errors && parser.errors.length > 0) {
@@ -442,7 +453,10 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
             }
             // --- We expect a component definition here!
             const nestedComps = nestedComponents.map((nc) => transformSingleElement(usesStack, nc));
-            return { name, value: nestedComps.length === 1 ? nestedComps[0] : nestedComps };
+            return {
+                name,
+                value: nestedComps.length === 1 ? nestedComps[0] : nestedComps,
+            };
         }
         // --- At this point, all attributes are ok, let's get the value.
         let value = valueAttr === null || valueAttr === void 0 ? void 0 : valueAttr.value;
@@ -583,7 +597,10 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
         const hasComponentName = exports.UCRegex.test(tagName);
         const shouldUseTextNodeElement = hasComponentName || tagName === "prop";
         const shouldCollapseWhitespace = tagName !== "event" && tagName !== "api";
-        parseEscapeCharactersInAttrValues(getAttributes(node));
+        const attrs = getAttributes(node);
+        desugarKeyOnlyAttrs(attrs);
+        desugarQuotelessAttrs(attrs, getText);
+        parseEscapeCharactersInAttrValues(attrs);
         parseEscapeCharactersInContent(childNodes);
         mergeConsecutiveTexts(childNodes, shouldCollapseWhitespace);
         let shouldUseCData = false;
@@ -618,12 +635,16 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                 }
             }
             else {
-                newChild = { kind: syntax_kind_1.SyntaxKind.TextNode, text: textValue };
+                newChild = {
+                    kind: syntax_kind_1.SyntaxKind.TextNode,
+                    text: textValue,
+                };
             }
             childNodes[i] = newChild;
         }
         const helperNodes = childNodes.filter((c) => c.kind === syntax_kind_1.SyntaxKind.ElementNode && !exports.UCRegex.test(getTagName(c)));
-        const otherNodes = childNodes.filter((c) => c.kind !== syntax_kind_1.SyntaxKind.ElementNode || (c.kind === syntax_kind_1.SyntaxKind.ElementNode && exports.UCRegex.test(getTagName(c))));
+        const otherNodes = childNodes.filter((c) => c.kind !== syntax_kind_1.SyntaxKind.ElementNode ||
+            (c.kind === syntax_kind_1.SyntaxKind.ElementNode && exports.UCRegex.test(getTagName(c))));
         const hasComponentChild = otherNodes.some((c) => c.kind === syntax_kind_1.SyntaxKind.ElementNode && exports.UCRegex.test(getTagName(c)));
         if (hasScriptChild && hasComponentChild) {
             const fragment = wrapWithFragment(otherNodes);
@@ -634,7 +655,8 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
     }
     function collapseWhitespace(childNodes) {
         for (let i = 0; i < childNodes.length; ++i) {
-            if (childNodes[i].kind === syntax_kind_1.SyntaxKind.StringLiteral || childNodes[i].kind === syntax_kind_1.SyntaxKind.TextNode) {
+            if (childNodes[i].kind === syntax_kind_1.SyntaxKind.StringLiteral ||
+                childNodes[i].kind === syntax_kind_1.SyntaxKind.TextNode) {
                 //the union is the same as \s , but took \u00a0 (non breaking space) out
                 //source https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Cheatsheet
                 const allSubsequentWsExceptNonBreakingSpace = /[\f\n\r\t\v\u0020\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+/g;
@@ -651,7 +673,8 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
     }
     function parseEscapeCharactersInContent(childNodes) {
         for (let node of childNodes) {
-            if (node.kind === syntax_kind_1.SyntaxKind.StringLiteral || node.kind === syntax_kind_1.SyntaxKind.TextNode) {
+            if (node.kind === syntax_kind_1.SyntaxKind.StringLiteral ||
+                node.kind === syntax_kind_1.SyntaxKind.TextNode) {
                 const escapedText = tryEscapeEntities(getText(node));
                 if (escapedText !== null) {
                     node.text = escapedText;
@@ -694,7 +717,8 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                     //&g
                     case CharacterCodes_1.CharacterCodes.g:
                         //\gt;
-                        if (text.charCodeAt(i + 2) === CharacterCodes_1.CharacterCodes.t && text.charCodeAt(i + 3) === CharacterCodes_1.CharacterCodes.semicolon) {
+                        if (text.charCodeAt(i + 2) === CharacterCodes_1.CharacterCodes.t &&
+                            text.charCodeAt(i + 3) === CharacterCodes_1.CharacterCodes.semicolon) {
                             newText = newText + text.substring(startOfSubstr, i) + ">";
                             i += 3;
                             startOfSubstr = i + 1;
@@ -703,7 +727,8 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                     //&l
                     case CharacterCodes_1.CharacterCodes.l:
                         //&lt;
-                        if (text.charCodeAt(i + 2) === CharacterCodes_1.CharacterCodes.t && text.charCodeAt(i + 3) === CharacterCodes_1.CharacterCodes.semicolon) {
+                        if (text.charCodeAt(i + 2) === CharacterCodes_1.CharacterCodes.t &&
+                            text.charCodeAt(i + 3) === CharacterCodes_1.CharacterCodes.semicolon) {
                             newText = newText + text.substring(startOfSubstr, i) + "<";
                             i += 3;
                             startOfSubstr = i + 1;
@@ -750,35 +775,40 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
         for (let i = childNodes.length - 1; i > 0; --i) {
             const node = childNodes[i - 1];
             const nextNode = childNodes[i];
-            if (node.kind === syntax_kind_1.SyntaxKind.StringLiteral && nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
+            if (node.kind === syntax_kind_1.SyntaxKind.StringLiteral &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
                 childNodes[i - 1] = {
                     kind: syntax_kind_1.SyntaxKind.CData,
                     text: getText(node).slice(1, -1) + getText(nextNode),
                 };
                 childNodes.pop();
             }
-            else if (node.kind === syntax_kind_1.SyntaxKind.CData && nextNode.kind === syntax_kind_1.SyntaxKind.StringLiteral) {
+            else if (node.kind === syntax_kind_1.SyntaxKind.CData &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.StringLiteral) {
                 childNodes[i - 1] = {
                     kind: syntax_kind_1.SyntaxKind.CData,
                     text: getText(node) + getText(nextNode).slice(1, -1),
                 };
                 childNodes.pop();
             }
-            else if (node.kind === syntax_kind_1.SyntaxKind.CData && nextNode.kind === syntax_kind_1.SyntaxKind.TextNode) {
+            else if (node.kind === syntax_kind_1.SyntaxKind.CData &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.TextNode) {
                 childNodes[i - 1] = {
                     kind: syntax_kind_1.SyntaxKind.CData,
                     text: getText(node) + getText(nextNode),
                 };
                 childNodes.pop();
             }
-            else if (node.kind === syntax_kind_1.SyntaxKind.CData && nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
+            else if (node.kind === syntax_kind_1.SyntaxKind.CData &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
                 childNodes[i - 1] = {
                     kind: syntax_kind_1.SyntaxKind.CData,
                     text: getText(node) + getText(nextNode),
                 };
                 childNodes.pop();
             }
-            else if (node.kind === syntax_kind_1.SyntaxKind.TextNode && nextNode.kind === syntax_kind_1.SyntaxKind.TextNode) {
+            else if (node.kind === syntax_kind_1.SyntaxKind.TextNode &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.TextNode) {
                 if (getText(node).endsWith(" ") && getText(nextNode).startsWith(" ")) {
                     node.text = getText(node).trimEnd();
                 }
@@ -788,7 +818,8 @@ function nodeToComponentDef(node, originalGetText, moduleResolver = () => "") {
                 };
                 childNodes.pop();
             }
-            else if (node.kind === syntax_kind_1.SyntaxKind.TextNode && nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
+            else if (node.kind === syntax_kind_1.SyntaxKind.TextNode &&
+                nextNode.kind === syntax_kind_1.SyntaxKind.CData) {
                 childNodes[i - 1] = {
                     kind: syntax_kind_1.SyntaxKind.CData,
                     text: getText(node) + getText(nextNode),
@@ -803,7 +834,10 @@ function createTextNodeCDataElement(textValue) {
         kind: syntax_kind_1.SyntaxKind.ElementNode,
         children: [
             { kind: syntax_kind_1.SyntaxKind.OpenNodeStart },
-            { kind: syntax_kind_1.SyntaxKind.TagNameNode, children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "TextNodeCData" }] },
+            {
+                kind: syntax_kind_1.SyntaxKind.TagNameNode,
+                children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "TextNodeCData" }],
+            },
             {
                 kind: syntax_kind_1.SyntaxKind.AttributeListNode,
                 children: [
@@ -826,7 +860,10 @@ function createTextNodeElement(textValue) {
         kind: syntax_kind_1.SyntaxKind.ElementNode,
         children: [
             { kind: syntax_kind_1.SyntaxKind.OpenNodeStart },
-            { kind: syntax_kind_1.SyntaxKind.TagNameNode, children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "TextNode" }] },
+            {
+                kind: syntax_kind_1.SyntaxKind.TagNameNode,
+                children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "TextNode" }],
+            },
             {
                 kind: syntax_kind_1.SyntaxKind.AttributeListNode,
                 children: [
@@ -886,9 +923,15 @@ function mergeValue(oldValue, itemValue) {
     }
 }
 function wrapWithFragment(wrappedChildren) {
-    const nameNode = { kind: syntax_kind_1.SyntaxKind.TagNameNode, children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "Fragment" }] };
+    const nameNode = {
+        kind: syntax_kind_1.SyntaxKind.TagNameNode,
+        children: [{ kind: syntax_kind_1.SyntaxKind.Identifier, text: "Fragment" }],
+    };
     return {
         kind: syntax_kind_1.SyntaxKind.ElementNode,
+        start: wrappedChildren[0].start,
+        pos: wrappedChildren[0].pos,
+        end: wrappedChildren[wrappedChildren.length - 1].end,
         children: [
             { kind: syntax_kind_1.SyntaxKind.OpenNodeStart },
             nameNode,
@@ -902,11 +945,11 @@ function wrapWithFragment(wrappedChildren) {
 }
 function getAttributes(node) {
     var _a, _b, _c;
-    return (_c = (_b = (_a = node.children) === null || _a === void 0 ? void 0 : _a.find((c) => c.kind === syntax_kind_1.SyntaxKind.AttributeListNode)) === null || _b === void 0 ? void 0 : _b.children) !== null && _c !== void 0 ? _c : [];
+    return ((_c = (_b = (_a = node.children) === null || _a === void 0 ? void 0 : _a.find((c) => c.kind === syntax_kind_1.SyntaxKind.AttributeListNode)) === null || _b === void 0 ? void 0 : _b.children) !== null && _c !== void 0 ? _c : []);
 }
 function getChildNodes(node) {
     var _a, _b, _c;
-    return (_c = (_b = (_a = node.children) === null || _a === void 0 ? void 0 : _a.find((c) => c.kind === syntax_kind_1.SyntaxKind.ContentListNode)) === null || _b === void 0 ? void 0 : _b.children) !== null && _c !== void 0 ? _c : [];
+    return ((_c = (_b = (_a = node.children) === null || _a === void 0 ? void 0 : _a.find((c) => c.kind === syntax_kind_1.SyntaxKind.ContentListNode)) === null || _b === void 0 ? void 0 : _b.children) !== null && _c !== void 0 ? _c : []);
 }
 function withNewChildNodes(node, newChildren) {
     var _a;
@@ -920,3 +963,27 @@ function withNewChildNodes(node, newChildren) {
             ...node.children.slice(childrenListIdx),
         ] });
 }
+function desugarKeyOnlyAttrs(attrs) {
+    var _a;
+    for (let attr of attrs) {
+        if (((_a = attr.children) === null || _a === void 0 ? void 0 : _a.length) === 1) {
+            const eq = {
+                kind: syntax_kind_1.SyntaxKind.Equal,
+            };
+            const value = {
+                kind: syntax_kind_1.SyntaxKind.StringLiteral,
+                text: '"true"',
+            };
+            attr.children.push(eq, value);
+        }
+    }
+}
+function desugarQuotelessAttrs(attrs, getText) {
+    var _a, _b, _c;
+    for (let attr of attrs) {
+        const attrValue = (_a = attr.children) === null || _a === void 0 ? void 0 : _a[2];
+        if (((_c = (_b = attr.children) === null || _b === void 0 ? void 0 : _b[2]) === null || _c === void 0 ? void 0 : _c.kind) === syntax_kind_1.SyntaxKind.Identifier) {
+            attrValue.text = '"' + getText(attrValue) + '"';
+        }
+    }
+}