xmlui 0.5.2-beta.4 → 0.6.1-beta.6

package/dist/scripts/bin/vite-ueml-plugin.js

@@ -73,9 +73,12 @@ function viteUemlPlugin(pluginOptions = {}) {
                 };
                 if (xmluiExtension.test(id)) {
                     const fileId = "" + itemIndex++;
-                    const componentDef = (0, xmlui_parser_1.parseXmlUiMarkup)(code, fileId, moduleResolver);
+                    let { component, errors, erroneousCompoundComponentName } = (0, xmlui_parser_1.xmlUiMarkupToComponent)(code, fileId, moduleResolver);
+                    if (errors.length > 0) {
+                        component = (0, xmlui_parser_1.errReportComponent)(errors, id, erroneousCompoundComponentName);
+                    }
                     const file = {
-                        component: componentDef,
+                        component,
                         src: code,
                         file: fileId,
                     };

package/dist/scripts/src/abstractions/scripting/Token.js

@@ -68,43 +68,45 @@ var TokenType;
     TokenType[TokenType["Dot"] = 56] = "Dot";
     TokenType[TokenType["Spread"] = 57] = "Spread";
     TokenType[TokenType["Global"] = 58] = "Global";
-    TokenType[TokenType["Arrow"] = 59] = "Arrow";
-    TokenType[TokenType["DecimalLiteral"] = 60] = "DecimalLiteral";
-    TokenType[TokenType["HexadecimalLiteral"] = 61] = "HexadecimalLiteral";
-    TokenType[TokenType["BinaryLiteral"] = 62] = "BinaryLiteral";
-    TokenType[TokenType["RealLiteral"] = 63] = "RealLiteral";
-    TokenType[TokenType["StringLiteral"] = 64] = "StringLiteral";
-    TokenType[TokenType["Infinity"] = 65] = "Infinity";
-    TokenType[TokenType["NaN"] = 66] = "NaN";
-    TokenType[TokenType["True"] = 67] = "True";
-    TokenType[TokenType["False"] = 68] = "False";
-    TokenType[TokenType["Typeof"] = 69] = "Typeof";
-    TokenType[TokenType["Null"] = 70] = "Null";
-    TokenType[TokenType["Undefined"] = 71] = "Undefined";
-    TokenType[TokenType["In"] = 72] = "In";
-    TokenType[TokenType["Let"] = 73] = "Let";
-    TokenType[TokenType["Const"] = 74] = "Const";
-    TokenType[TokenType["Var"] = 75] = "Var";
-    TokenType[TokenType["If"] = 76] = "If";
-    TokenType[TokenType["Else"] = 77] = "Else";
-    TokenType[TokenType["Return"] = 78] = "Return";
-    TokenType[TokenType["Break"] = 79] = "Break";
-    TokenType[TokenType["Continue"] = 80] = "Continue";
-    TokenType[TokenType["Do"] = 81] = "Do";
-    TokenType[TokenType["While"] = 82] = "While";
-    TokenType[TokenType["For"] = 83] = "For";
-    TokenType[TokenType["Of"] = 84] = "Of";
-    TokenType[TokenType["Try"] = 85] = "Try";
-    TokenType[TokenType["Catch"] = 86] = "Catch";
-    TokenType[TokenType["Finally"] = 87] = "Finally";
-    TokenType[TokenType["Throw"] = 88] = "Throw";
-    TokenType[TokenType["Switch"] = 89] = "Switch";
-    TokenType[TokenType["Case"] = 90] = "Case";
-    TokenType[TokenType["Default"] = 91] = "Default";
-    TokenType[TokenType["Delete"] = 92] = "Delete";
-    TokenType[TokenType["Function"] = 93] = "Function";
-    TokenType[TokenType["Export"] = 94] = "Export";
-    TokenType[TokenType["Import"] = 95] = "Import";
-    TokenType[TokenType["As"] = 96] = "As";
-    TokenType[TokenType["From"] = 97] = "From";
+    TokenType[TokenType["Backtick"] = 59] = "Backtick";
+    TokenType[TokenType["DollarLBrace"] = 60] = "DollarLBrace";
+    TokenType[TokenType["Arrow"] = 61] = "Arrow";
+    TokenType[TokenType["DecimalLiteral"] = 62] = "DecimalLiteral";
+    TokenType[TokenType["HexadecimalLiteral"] = 63] = "HexadecimalLiteral";
+    TokenType[TokenType["BinaryLiteral"] = 64] = "BinaryLiteral";
+    TokenType[TokenType["RealLiteral"] = 65] = "RealLiteral";
+    TokenType[TokenType["StringLiteral"] = 66] = "StringLiteral";
+    TokenType[TokenType["Infinity"] = 67] = "Infinity";
+    TokenType[TokenType["NaN"] = 68] = "NaN";
+    TokenType[TokenType["True"] = 69] = "True";
+    TokenType[TokenType["False"] = 70] = "False";
+    TokenType[TokenType["Typeof"] = 71] = "Typeof";
+    TokenType[TokenType["Null"] = 72] = "Null";
+    TokenType[TokenType["Undefined"] = 73] = "Undefined";
+    TokenType[TokenType["In"] = 74] = "In";
+    TokenType[TokenType["Let"] = 75] = "Let";
+    TokenType[TokenType["Const"] = 76] = "Const";
+    TokenType[TokenType["Var"] = 77] = "Var";
+    TokenType[TokenType["If"] = 78] = "If";
+    TokenType[TokenType["Else"] = 79] = "Else";
+    TokenType[TokenType["Return"] = 80] = "Return";
+    TokenType[TokenType["Break"] = 81] = "Break";
+    TokenType[TokenType["Continue"] = 82] = "Continue";
+    TokenType[TokenType["Do"] = 83] = "Do";
+    TokenType[TokenType["While"] = 84] = "While";
+    TokenType[TokenType["For"] = 85] = "For";
+    TokenType[TokenType["Of"] = 86] = "Of";
+    TokenType[TokenType["Try"] = 87] = "Try";
+    TokenType[TokenType["Catch"] = 88] = "Catch";
+    TokenType[TokenType["Finally"] = 89] = "Finally";
+    TokenType[TokenType["Throw"] = 90] = "Throw";
+    TokenType[TokenType["Switch"] = 91] = "Switch";
+    TokenType[TokenType["Case"] = 92] = "Case";
+    TokenType[TokenType["Default"] = 93] = "Default";
+    TokenType[TokenType["Delete"] = 94] = "Delete";
+    TokenType[TokenType["Function"] = 95] = "Function";
+    TokenType[TokenType["Export"] = 96] = "Export";
+    TokenType[TokenType["Import"] = 97] = "Import";
+    TokenType[TokenType["As"] = 98] = "As";
+    TokenType[TokenType["From"] = 99] = "From";
 })(TokenType || (exports.TokenType = TokenType = {}));

package/dist/scripts/src/components-core/theming/themes/base-utils.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paddingSubject = paddingSubject;
+exports.borderSubject = borderSubject;
+function paddingSubject(name, valueSpec) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return {
+        [`padding-left-${name}`]: (_a = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.left) !== null && _a !== void 0 ? _a : `$padding-horizontal-${name}`,
+        [`padding-right-${name}`]: (_b = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.right) !== null && _b !== void 0 ? _b : `$padding-horizontal-${name}`,
+        [`padding-top-${name}`]: (_c = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.top) !== null && _c !== void 0 ? _c : `$padding-vertical-${name}`,
+        [`padding-bottom-${name}`]: (_d = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.bottom) !== null && _d !== void 0 ? _d : `$padding-vertical-${name}`,
+        [`padding-horizontal-${name}`]: (_e = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.horizontal) !== null && _e !== void 0 ? _e : "",
+        [`padding-vertical-${name}`]: (_f = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.vertical) !== null && _f !== void 0 ? _f : "",
+        [`padding-${name}`]: (_g = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) !== null && _g !== void 0 ? _g : `$padding-top-${name} $padding-right-${name} $padding-bottom-${name} $padding-left-${name}`,
+    };
+}
+function borderSubject(name, valueSpec) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ [`radius-${name}`]: "$radius" }, borderEdgeSubject("left", (_b = (_a = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.left) !== null && _a !== void 0 ? _a : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.horizontal) !== null && _b !== void 0 ? _b : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), borderEdgeSubject("right", (_d = (_c = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.right) !== null && _c !== void 0 ? _c : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.horizontal) !== null && _d !== void 0 ? _d : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), borderEdgeSubject("top", (_f = (_e = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.top) !== null && _e !== void 0 ? _e : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.vertical) !== null && _f !== void 0 ? _f : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), borderEdgeSubject("bottom", (_h = (_g = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.bottom) !== null && _g !== void 0 ? _g : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.vertical) !== null && _h !== void 0 ? _h : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), borderEdgeSubject("horizontal", (_j = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.horizontal) !== null && _j !== void 0 ? _j : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), borderEdgeSubject("vertical", (_k = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.vertical) !== null && _k !== void 0 ? _k : valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all)), { [`color-border-${name}`]: (_m = (_l = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _l === void 0 ? void 0 : _l.color) !== null && _m !== void 0 ? _m : "", [`thickness-border-${name}`]: (_p = (_o = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _o === void 0 ? void 0 : _o.thickness) !== null && _p !== void 0 ? _p : "", [`style-border-${name}`]: (_r = (_q = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _q === void 0 ? void 0 : _q.style) !== null && _r !== void 0 ? _r : "", [`border-${name}`]: `${(_t = (_s = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _s === void 0 ? void 0 : _s.thickness) !== null && _t !== void 0 ? _t : `$thickness-border-${name}`} ` +
+            `${(_v = (_u = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _u === void 0 ? void 0 : _u.style) !== null && _v !== void 0 ? _v : `$style-border-${name}`} ` +
+            `${(_x = (_w = valueSpec === null || valueSpec === void 0 ? void 0 : valueSpec.all) === null || _w === void 0 ? void 0 : _w.color) !== null && _x !== void 0 ? _x : `$color-border-${name}`} ` });
+    function borderEdgeSubject(edge, edgeSpec) {
+        var _a, _b, _c, _d;
+        return {
+            [`color-border-${edge}-${name}`]: (_a = edgeSpec === null || edgeSpec === void 0 ? void 0 : edgeSpec.color) !== null && _a !== void 0 ? _a : "",
+            [`thickness-border-${edge}-${name}`]: (_b = edgeSpec === null || edgeSpec === void 0 ? void 0 : edgeSpec.thickness) !== null && _b !== void 0 ? _b : "",
+            [`style-border-${edge}-${name}`]: (_c = edgeSpec === null || edgeSpec === void 0 ? void 0 : edgeSpec.style) !== null && _c !== void 0 ? _c : "",
+            [`border-${edge}-${name}`]: (_d = edgeSpec === null || edgeSpec === void 0 ? void 0 : edgeSpec.all) !== null && _d !== void 0 ? _d : `$thickness-border-${edge}-${name} $style-border-${edge}-${name} $color-border-${edge}-${name}`,
+        };
+    }
+}

package/dist/scripts/src/components-core/xmlui-parser.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseXmlUiMarkup = parseXmlUiMarkup;
+exports.xmlUiMarkupToComponent = xmlUiMarkupToComponent;
+exports.errReportComponent = errReportComponent;
 const parser_1 = require("../parsers/xmlui-parser/parser");
 const transform_1 = require("../parsers/xmlui-parser/transform");
-function parseXmlUiMarkup(source, fileId = 0, moduleResolver) {
+const diagnostics_1 = require("../parsers/xmlui-parser/diagnostics");
+const syntax_kind_1 = require("../parsers/xmlui-parser/syntax-kind");
+function xmlUiMarkupToComponent(source, fileId = 0, moduleResolver) {
     const { parse, getText } = (0, parser_1.createXmlUiParser)(source);
     const { node, errors } = parse();
     if (errors.length > 0) {
@@ -13,13 +16,92 @@ function parseXmlUiMarkup(source, fileId = 0, moduleResolver) {
                 newlinePositions.push(i);
             }
         }
-        const errorWithLines = addPositions(errors, newlinePositions);
-        const errorMessages = errorWithLines
-            .map((e) => `Error at line: ${e.line}, column: ${e.col}:\n   ${e.message}\n`)
-            .join("\n");
-        throw new Error(errorMessages);
+        const errorsWithLines = addPositions(errors, newlinePositions);
+        const erroneousCompoundComponentName = getCompoundCompName(node, getText);
+        return { component: null, errors: errorsWithLines, erroneousCompoundComponentName };
     }
-    return (0, transform_1.nodeToComponentDef)(node, getText, fileId, moduleResolver);
+    try {
+        return { component: (0, transform_1.nodeToComponentDef)(node, getText, fileId, moduleResolver), errors: [] };
+    }
+    catch (e) {
+        const erroneousCompoundComponentName = getCompoundCompName(node, getText);
+        const singleErr = {
+            message: e.message,
+            col: 0,
+            line: 0,
+            code: diagnostics_1.ErrCodes.expEq,
+            category: diagnostics_1.DiagnosticCategory.Error,
+            pos: 0,
+            end: 0,
+        };
+        return {
+            component: null,
+            erroneousCompoundComponentName,
+            errors: [singleErr],
+        };
+    }
+}
+/** returns a component definition containing the errors.
+ * It is a component and a compound component definition at the same time,
+ * so that it can be used to render the errors for a compound component as well*/
+function errReportComponent(errors, fileName, compoundCompName) {
+    function makeComponent() {
+        const errList = errors
+            .sort((a, b) => a.pos - b.pos)
+            .map((e, idx) => {
+            return {
+                type: "VStack",
+                props: { gap: "0px" },
+                children: [
+                    {
+                        type: "HStack",
+                        props: { gap: "0" },
+                        children: [
+                            {
+                                type: "Text",
+                                props: {
+                                    value: `#${idx + 1}: ${fileName} (${e.line}:${e.col}):\xa0`,
+                                    color: "$color-info",
+                                },
+                            },
+                            {
+                                type: "Text",
+                                props: { value: ` ${e.message}`, fontWeight: "bold" },
+                            },
+                        ],
+                    },
+                ],
+            };
+        });
+        const comp = {
+            type: "VStack",
+            props: { padding: "$padding-normal", gap: 0 },
+            children: [
+                {
+                    type: "H1",
+                    props: {
+                        value: `${errList.length} ${errList.length > 1 ? "Errors" : "Error"} found while processing XMLUI markup`,
+                        padding: "$padding-normal",
+                        backgroundColor: "$color-error",
+                        color: "white",
+                    },
+                },
+                {
+                    type: "VStack",
+                    props: {
+                        gap: "$gap-tight",
+                        padding: "$padding-normal",
+                    },
+                    children: errList,
+                },
+            ],
+        };
+        return comp;
+    }
+    const comp = makeComponent();
+    comp.name = compoundCompName;
+    comp.component = makeComponent();
+    return comp;
 }
 function addPositions(errors, newlinePositions) {
     var _a;
@@ -36,8 +118,7 @@ function addPositions(errors, newlinePositions) {
             const newlinePos = newlinePositions[i];
             if (err.pos < newlinePos) {
                 err.line = i + 1;
-                err.col =
-                    err.pos - ((_a = newlinePositions[i - 1]) !== null && _a !== void 0 ? _a : 0) + 1;
+                err.col = err.pos - ((_a = newlinePositions[i - 1]) !== null && _a !== void 0 ? _a : 0) + 1;
                 break;
             }
         }
@@ -49,3 +130,20 @@ function addPositions(errors, newlinePositions) {
     }
     return errors;
 }
+function getCompoundCompName(node, getText) {
+    var _a, _b, _c, _d, _e, _f;
+    const rootTag = (_a = node === null || node === void 0 ? void 0 : node.children) === null || _a === void 0 ? void 0 : _a[0];
+    const rootTagNameTokens = (_c = (_b = rootTag === null || rootTag === void 0 ? void 0 : rootTag.children) === null || _b === void 0 ? void 0 : _b.find((c) => c.kind === syntax_kind_1.SyntaxKind.TagNameNode)) === null || _c === void 0 ? void 0 : _c.children;
+    const rootTagName = rootTagNameTokens === null || rootTagNameTokens === void 0 ? void 0 : rootTagNameTokens[rootTagNameTokens.length - 1];
+    if (rootTagName === undefined || getText(rootTagName) !== "Component") {
+        return undefined;
+    }
+    const attrs = (_e = (_d = rootTag.children) === null || _d === void 0 ? void 0 : _d.find((c) => c.kind === syntax_kind_1.SyntaxKind.AttributeListNode)) === null || _e === void 0 ? void 0 : _e.children;
+    const nameAttrTokens = (_f = attrs === null || attrs === void 0 ? void 0 : attrs.find((c) => c.kind === syntax_kind_1.SyntaxKind.AttributeNode && getText(c === null || c === void 0 ? void 0 : c.children[0]) === "name")) === null || _f === void 0 ? void 0 : _f.children;
+    const nameValueToken = nameAttrTokens === null || nameAttrTokens === void 0 ? void 0 : nameAttrTokens[nameAttrTokens.length - 1];
+    if (nameValueToken !== undefined && nameValueToken.kind === syntax_kind_1.SyntaxKind.StringLiteral) {
+        const strLit = getText(nameValueToken);
+        return strLit.substring(1, strLit.length - 1);
+    }
+    return undefined;
+}

package/dist/scripts/src/parsers/scripting/Lexer.js

@@ -18,61 +18,64 @@ var LexerPhase;
     LexerPhase[LexerPhase["BlockCommentTrail2"] = 4] = "BlockCommentTrail2";
     // Multi-char tokens
     LexerPhase[LexerPhase["Slash"] = 5] = "Slash";
-    LexerPhase[LexerPhase["Or"] = 6] = "Or";
-    LexerPhase[LexerPhase["Asterisk"] = 7] = "Asterisk";
-    LexerPhase[LexerPhase["Ampersand"] = 8] = "Ampersand";
-    LexerPhase[LexerPhase["Equal"] = 9] = "Equal";
-    LexerPhase[LexerPhase["DoubleEqual"] = 10] = "DoubleEqual";
-    LexerPhase[LexerPhase["NotEqual"] = 11] = "NotEqual";
-    LexerPhase[LexerPhase["Exclamation"] = 12] = "Exclamation";
-    LexerPhase[LexerPhase["AngleLeft"] = 13] = "AngleLeft";
-    LexerPhase[LexerPhase["AngleRight"] = 14] = "AngleRight";
-    LexerPhase[LexerPhase["SignedShiftRight"] = 15] = "SignedShiftRight";
-    LexerPhase[LexerPhase["IdTail"] = 16] = "IdTail";
-    LexerPhase[LexerPhase["Dot"] = 17] = "Dot";
-    LexerPhase[LexerPhase["DotDot"] = 18] = "DotDot";
-    LexerPhase[LexerPhase["Colon"] = 19] = "Colon";
-    LexerPhase[LexerPhase["Zero"] = 20] = "Zero";
-    LexerPhase[LexerPhase["QuestionMark"] = 21] = "QuestionMark";
-    LexerPhase[LexerPhase["HexaFirst"] = 22] = "HexaFirst";
-    LexerPhase[LexerPhase["HexaTail"] = 23] = "HexaTail";
-    LexerPhase[LexerPhase["BinaryFirst"] = 24] = "BinaryFirst";
-    LexerPhase[LexerPhase["BinaryTail"] = 25] = "BinaryTail";
-    LexerPhase[LexerPhase["DecimalOrReal"] = 26] = "DecimalOrReal";
-    LexerPhase[LexerPhase["RealFractionalFirst"] = 27] = "RealFractionalFirst";
-    LexerPhase[LexerPhase["RealFractionalTail"] = 28] = "RealFractionalTail";
-    LexerPhase[LexerPhase["RealExponent"] = 29] = "RealExponent";
-    LexerPhase[LexerPhase["RealExponentSign"] = 30] = "RealExponentSign";
-    LexerPhase[LexerPhase["RealExponentTail"] = 31] = "RealExponentTail";
-    LexerPhase[LexerPhase["String"] = 32] = "String";
-    LexerPhase[LexerPhase["StringBackSlash"] = 33] = "StringBackSlash";
-    LexerPhase[LexerPhase["StringHexa1"] = 34] = "StringHexa1";
-    LexerPhase[LexerPhase["StringHexa2"] = 35] = "StringHexa2";
-    LexerPhase[LexerPhase["StringUHexa1"] = 36] = "StringUHexa1";
-    LexerPhase[LexerPhase["StringUHexa2"] = 37] = "StringUHexa2";
-    LexerPhase[LexerPhase["StringUHexa3"] = 38] = "StringUHexa3";
-    LexerPhase[LexerPhase["StringUHexa4"] = 39] = "StringUHexa4";
-    LexerPhase[LexerPhase["StringUcp1"] = 40] = "StringUcp1";
-    LexerPhase[LexerPhase["StringUcp2"] = 41] = "StringUcp2";
-    LexerPhase[LexerPhase["StringUcp3"] = 42] = "StringUcp3";
-    LexerPhase[LexerPhase["StringUcp4"] = 43] = "StringUcp4";
-    LexerPhase[LexerPhase["StringUcp5"] = 44] = "StringUcp5";
-    LexerPhase[LexerPhase["StringUcp6"] = 45] = "StringUcp6";
-    LexerPhase[LexerPhase["StringUcpTail"] = 46] = "StringUcpTail";
+    LexerPhase[LexerPhase["Dollar"] = 6] = "Dollar";
+    LexerPhase[LexerPhase["Or"] = 7] = "Or";
+    LexerPhase[LexerPhase["Asterisk"] = 8] = "Asterisk";
+    LexerPhase[LexerPhase["Ampersand"] = 9] = "Ampersand";
+    LexerPhase[LexerPhase["Equal"] = 10] = "Equal";
+    LexerPhase[LexerPhase["DoubleEqual"] = 11] = "DoubleEqual";
+    LexerPhase[LexerPhase["NotEqual"] = 12] = "NotEqual";
+    LexerPhase[LexerPhase["Exclamation"] = 13] = "Exclamation";
+    LexerPhase[LexerPhase["AngleLeft"] = 14] = "AngleLeft";
+    LexerPhase[LexerPhase["AngleRight"] = 15] = "AngleRight";
+    LexerPhase[LexerPhase["SignedShiftRight"] = 16] = "SignedShiftRight";
+    LexerPhase[LexerPhase["IdTail"] = 17] = "IdTail";
+    LexerPhase[LexerPhase["Dot"] = 18] = "Dot";
+    LexerPhase[LexerPhase["DotDot"] = 19] = "DotDot";
+    LexerPhase[LexerPhase["Colon"] = 20] = "Colon";
+    LexerPhase[LexerPhase["Zero"] = 21] = "Zero";
+    LexerPhase[LexerPhase["QuestionMark"] = 22] = "QuestionMark";
+    LexerPhase[LexerPhase["HexaFirst"] = 23] = "HexaFirst";
+    LexerPhase[LexerPhase["HexaTail"] = 24] = "HexaTail";
+    LexerPhase[LexerPhase["BinaryFirst"] = 25] = "BinaryFirst";
+    LexerPhase[LexerPhase["BinaryTail"] = 26] = "BinaryTail";
+    LexerPhase[LexerPhase["DecimalOrReal"] = 27] = "DecimalOrReal";
+    LexerPhase[LexerPhase["RealFractionalFirst"] = 28] = "RealFractionalFirst";
+    LexerPhase[LexerPhase["RealFractionalTail"] = 29] = "RealFractionalTail";
+    LexerPhase[LexerPhase["RealExponent"] = 30] = "RealExponent";
+    LexerPhase[LexerPhase["RealExponentSign"] = 31] = "RealExponentSign";
+    LexerPhase[LexerPhase["RealExponentTail"] = 32] = "RealExponentTail";
+    LexerPhase[LexerPhase["StringTemplateLiteral"] = 33] = "StringTemplateLiteral";
+    LexerPhase[LexerPhase["StringTemplateLiteralBackSlash"] = 34] = "StringTemplateLiteralBackSlash";
+    LexerPhase[LexerPhase["String"] = 35] = "String";
+    LexerPhase[LexerPhase["StringBackSlash"] = 36] = "StringBackSlash";
+    LexerPhase[LexerPhase["StringHexa1"] = 37] = "StringHexa1";
+    LexerPhase[LexerPhase["StringHexa2"] = 38] = "StringHexa2";
+    LexerPhase[LexerPhase["StringUHexa1"] = 39] = "StringUHexa1";
+    LexerPhase[LexerPhase["StringUHexa2"] = 40] = "StringUHexa2";
+    LexerPhase[LexerPhase["StringUHexa3"] = 41] = "StringUHexa3";
+    LexerPhase[LexerPhase["StringUHexa4"] = 42] = "StringUHexa4";
+    LexerPhase[LexerPhase["StringUcp1"] = 43] = "StringUcp1";
+    LexerPhase[LexerPhase["StringUcp2"] = 44] = "StringUcp2";
+    LexerPhase[LexerPhase["StringUcp3"] = 45] = "StringUcp3";
+    LexerPhase[LexerPhase["StringUcp4"] = 46] = "StringUcp4";
+    LexerPhase[LexerPhase["StringUcp5"] = 47] = "StringUcp5";
+    LexerPhase[LexerPhase["StringUcp6"] = 48] = "StringUcp6";
+    LexerPhase[LexerPhase["StringUcpTail"] = 49] = "StringUcpTail";
     // --- Assignments
-    LexerPhase[LexerPhase["Exponent"] = 47] = "Exponent";
-    LexerPhase[LexerPhase["Plus"] = 48] = "Plus";
-    LexerPhase[LexerPhase["Minus"] = 49] = "Minus";
-    LexerPhase[LexerPhase["Divide"] = 50] = "Divide";
-    LexerPhase[LexerPhase["Remainder"] = 51] = "Remainder";
-    LexerPhase[LexerPhase["ShiftLeft"] = 52] = "ShiftLeft";
-    LexerPhase[LexerPhase["ShiftRight"] = 53] = "ShiftRight";
-    LexerPhase[LexerPhase["LogicalAnd"] = 54] = "LogicalAnd";
-    LexerPhase[LexerPhase["BitwiseXor"] = 55] = "BitwiseXor";
-    LexerPhase[LexerPhase["LogicalOr"] = 56] = "LogicalOr";
-    LexerPhase[LexerPhase["NullCoalesce"] = 57] = "NullCoalesce";
+    LexerPhase[LexerPhase["Exponent"] = 50] = "Exponent";
+    LexerPhase[LexerPhase["Plus"] = 51] = "Plus";
+    LexerPhase[LexerPhase["Minus"] = 52] = "Minus";
+    LexerPhase[LexerPhase["Divide"] = 53] = "Divide";
+    LexerPhase[LexerPhase["Remainder"] = 54] = "Remainder";
+    LexerPhase[LexerPhase["ShiftLeft"] = 55] = "ShiftLeft";
+    LexerPhase[LexerPhase["ShiftRight"] = 56] = "ShiftRight";
+    LexerPhase[LexerPhase["LogicalAnd"] = 57] = "LogicalAnd";
+    LexerPhase[LexerPhase["BitwiseXor"] = 58] = "BitwiseXor";
+    LexerPhase[LexerPhase["LogicalOr"] = 59] = "LogicalOr";
+    LexerPhase[LexerPhase["NullCoalesce"] = 60] = "NullCoalesce";
     // --- Other
-    LexerPhase[LexerPhase["RegEx"] = 58] = "RegEx";
+    LexerPhase[LexerPhase["RegEx"] = 61] = "RegEx";
 })(LexerPhase || (LexerPhase = {}));
 /**
  * This class implements the lexer of binding expressions
@@ -94,6 +97,7 @@ class Lexer {
         this._prefetchedColumn = null;
         // --- input position at the beginning of last fetch
         this._lastFetchPosition = 0;
+        this._phaseExternallySet = null;
     }
     /**
      * Fetches the next token without advancing to its position
@@ -156,6 +160,14 @@ class Lexer {
             ? this.input.getTail(this._ahead[0].location.startPosition)
             : this.input.getTail(this._lastFetchPosition);
     }
+    /**
+     * Parsing template literals requires a context sensitive lexer.
+     * This method has to be called by the parser when the lexer needs to scan a string inside a template literal.
+     * Call this after the first opening backing and after the parser is done with parsing a placeholder, after the right brace.
+     */
+    setStartingPhaseToTemplateLiteral() {
+        this._phaseExternallySet = LexerPhase.StringTemplateLiteral;
+    }
     /**
      * Fetches the next character from the input stream
      */
@@ -187,7 +199,7 @@ class Lexer {
         let ch = null;
         let useResolver = false;
         // --- Start from the beginning
-        let phase = LexerPhase.Start;
+        let phase = this.getStartingPhaseThenReset();
         // --- Process all token characters
         while (true) {
             // --- Get the next character
@@ -201,7 +213,7 @@ class Lexer {
                 tokenType = Token_1.TokenType.Unknown;
             }
             // --- Follow the lexer state machine
-            switch (phase) {
+            phaseSwitch: switch (phase) {
                 // ====================================================================
                 // Process the first character
                 case LexerPhase.Start:
@@ -219,6 +231,10 @@ class Lexer {
                             phase = LexerPhase.Slash;
                             tokenType = Token_1.TokenType.Divide;
                             break;
+                        case "$":
+                            phase = LexerPhase.Dollar;
+                            tokenType = Token_1.TokenType.Identifier;
+                            break;
                         case "*":
                             phase = LexerPhase.Asterisk;
                             tokenType = Token_1.TokenType.Multiply;
@@ -267,6 +283,8 @@ class Lexer {
                             phase = LexerPhase.Colon;
                             tokenType = Token_1.TokenType.Colon;
                             break;
+                        case "`":
+                            return completeToken(Token_1.TokenType.Backtick);
                         case "[":
                             return completeToken(Token_1.TokenType.LSquare);
                         case "]":
@@ -330,6 +348,18 @@ class Lexer {
                     break;
                 // ====================================================================
                 // Process comments
+                // A dollar sign is also a valid variable name. When it isn't a dollar left brace, we continue as if it was an identifier
+                case LexerPhase.Dollar:
+                    if (ch === "{") {
+                        return completeToken(Token_1.TokenType.DollarLBrace);
+                    }
+                    phase = LexerPhase.IdTail;
+                    useResolver = true;
+                    tokenType = Token_1.TokenType.Identifier;
+                    if (!isIdContinuation(ch)) {
+                        makeToken();
+                    }
+                    break;
                 // --- Looking for the end of whitespace
                 case LexerPhase.InWhiteSpace:
                     if (ch !== " " && ch !== "\t" && ch !== "\r" && ch !== "\n") {
@@ -571,7 +601,8 @@ class Lexer {
                     if (isDecimalDigit(ch) || ch === "_") {
                         break;
                     }
-                    else if (ch === "." && (this.input.peek() === null || isDecimalDigit(this.input.peek()))) {
+                    else if (ch === "." &&
+                        (this.input.peek() === null || isDecimalDigit(this.input.peek()))) {
                         phase = LexerPhase.RealFractionalFirst;
                         tokenType = Token_1.TokenType.Unknown;
                     }
@@ -630,6 +661,37 @@ class Lexer {
                         return makeToken();
                     }
                     break;
+                case LexerPhase.StringTemplateLiteralBackSlash: {
+                    phase = LexerPhase.StringTemplateLiteral;
+                    const charAhead1 = this.input.ahead(0);
+                    const charAhead2 = this.input.ahead(1);
+                    if (charAhead1 === "`" || (charAhead1 === "$" && charAhead2 === "{")) {
+                        return completeToken(Token_1.TokenType.StringLiteral);
+                    }
+                    break;
+                }
+                case LexerPhase.StringTemplateLiteral:
+                    switch (ch) {
+                        case "\\":
+                            phase = LexerPhase.StringTemplateLiteralBackSlash;
+                            tokenType = Token_1.TokenType.Unknown;
+                            break phaseSwitch;
+                        case "`":
+                            return completeToken(Token_1.TokenType.Backtick);
+                        case "$":
+                            const charAhead = this.input.ahead(0);
+                            if (charAhead === "{") {
+                                appendTokenChar();
+                                this.fetchNextChar();
+                                return completeToken(Token_1.TokenType.DollarLBrace);
+                            }
+                    }
+                    const charAhead1 = this.input.ahead(0);
+                    const charAhead2 = this.input.ahead(1);
+                    if (charAhead1 === "`" || (charAhead1 === "$" && charAhead2 === "{")) {
+                        return completeToken(Token_1.TokenType.StringLiteral);
+                    }
+                    break;
                 case LexerPhase.String:
                     if (ch === stringState) {
                         return completeToken(Token_1.TokenType.StringLiteral);
@@ -833,7 +895,9 @@ class Lexer {
             var _a;
             if (useResolver) {
                 tokenType =
-                    (_a = resolverHash.get(text)) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) && text[text.length - 1] !== "'" ? Token_1.TokenType.Identifier : Token_1.TokenType.Unknown);
+                    (_a = resolverHash.get(text)) !== null && _a !== void 0 ? _a : (isIdStart(text[0]) && text[text.length - 1] !== "'"
+                        ? Token_1.TokenType.Identifier
+                        : Token_1.TokenType.Unknown);
             }
             return {
                 text,
@@ -860,6 +924,14 @@ class Lexer {
             return makeToken();
         }
     }
+    getStartingPhaseThenReset() {
+        if (this._phaseExternallySet !== null) {
+            const phase = this._phaseExternallySet;
+            this._phaseExternallySet = null;
+            return phase;
+        }
+        return LexerPhase.Start;
+    }
     /**
      * Fetches the next RegEx token from the input stream
      */
@@ -996,7 +1068,11 @@ function isIdStart(ch) {
  * @param ch Character to test
  */
 function isIdContinuation(ch) {
-    return (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") || (ch >= "0" && ch <= "9") || ch === "_" || ch === "$";
+    return ((ch >= "a" && ch <= "z") ||
+        (ch >= "A" && ch <= "Z") ||
+        (ch >= "0" && ch <= "9") ||
+        ch === "_" ||
+        ch === "$");
 }
 /**
  * Tests if a character is a binary digit