xmlui 0.10.19 → 0.10.21

package/dist/scripts/src/parsers/style-parser/StyleParser.js

@@ -145,77 +145,36 @@ class StyleParser {
         const themeIdNode = this.tryThemeId();
         if (themeIdNode)
             return themeIdNode;
-        const parser = this;
-        switch (startToken.type) {
-            case tokens_1.StyleTokenType.ColorName:
-                this._lexer.get();
-                return this.createNode("Color", {
-                    value: startToken.text.toLowerCase(),
-                }, startToken);
-            case tokens_1.StyleTokenType.HexaColor:
-                this._lexer.get();
-                return this.createNode("Color", {
-                    value: startToken.text,
-                }, startToken);
-            case tokens_1.StyleTokenType.ColorFunc:
-                let success = false;
-                switch (startToken.text) {
-                    case "rgb":
-                        success = parseColorParameters(["V%", "V%", "V%"]);
-                        break;
-                    case "rgba":
-                        success = parseColorParameters(["V%", "V%", "V%", "alpha"]);
-                        break;
-                    case "hsl":
-                        success = parseColorParameters(["angle", "%", "%"]);
-                        break;
-                    case "hsla":
-                        success = parseColorParameters(["angle", "%", "%", "alpha"]);
-                        break;
-                    default:
-                        this.reportError("S006", startToken, startToken.text);
-                        return null;
-                }
-                if (success) {
-                    return {
-                        type: "Color",
-                        startPosition: startToken.start,
-                        endPosition: this._lexer.peek().start,
-                        value: this.getSource(startToken, this._lexer.peek()),
-                    };
-                }
-                return null;
-            default:
-                this.reportError("S005", startToken);
-                return null;
-        }
-        function parseColorParameters(pars) {
+        /**
+         * Parses color function parameters
+         */
+        const parseColorParameters = (pars) => {
             // --- Skip the color function name token
-            parser._lexer.get();
+            this._lexer.get();
             // --- Expect "("
-            parser.expectToken(tokens_1.StyleTokenType.LParent, "S007");
+            this.expectToken(tokens_1.StyleTokenType.LParent, "S007");
             // --- Iterate through pars
             for (let i = 0; i < pars.length; i++) {
                 // --- Get the parameter value
-                const value = parser.getNumber();
+                const value = this.getNumber();
                 if (value === null)
                     return false;
                 // --- Get optional parameter unit
-                const unit = parser._lexer.peek(true);
+                const unit = this._lexer.peek(true);
                 // --- Process the value & unit
                 switch (pars[i]) {
                     // 0-255 or 0%-100%
                     case "V%":
                         if (unit.type === tokens_1.StyleTokenType.Percentage) {
                             if (value < 0 || value > 100) {
-                                parser.reportError("S008");
+                                this.reportError("S008");
                                 return false;
                             }
-                            parser._lexer.get();
+                            this._lexer.get();
                         }
                         else {
                             if (value < 0 || value > 255) {
-                                parser.reportError("S009");
+                                this.reportError("S009");
                                 return false;
                             }
                         }
@@ -223,28 +182,28 @@ class StyleParser {
                     // 0%-100%
                     case "%":
                         if (unit.type !== tokens_1.StyleTokenType.Percentage || value < 0 || value > 100) {
-                            parser.reportError("S008");
+                            this.reportError("S008");
                             return false;
                         }
-                        parser._lexer.get();
+                        this._lexer.get();
                         break;
                     case "angle":
                         if (unit.type === tokens_1.StyleTokenType.Angle) {
-                            parser._lexer.get();
+                            this._lexer.get();
                         }
                         break;
                     // alpha with units
                     case "alpha":
                         if (unit.type === tokens_1.StyleTokenType.Percentage) {
                             if (value < 0 || value > 100) {
-                                parser.reportError("S008");
+                                this.reportError("S008");
                                 return false;
                             }
-                            parser._lexer.get();
+                            this._lexer.get();
                         }
                         else {
                             if (value < 0 || value > 1) {
-                                parser.reportError("S011");
+                                this.reportError("S011");
                                 return false;
                             }
                         }
@@ -254,30 +213,73 @@ class StyleParser {
                 if (i === pars.length - 1)
                     continue;
                 // --- Process the separator
-                let sepToken = parser._lexer.peek(true);
+                let sepToken = this._lexer.peek(true);
                 if (sepToken.type === tokens_1.StyleTokenType.Ws) {
-                    parser._lexer.get();
-                    sepToken = parser._lexer.peek(true);
+                    this._lexer.get();
+                    sepToken = this._lexer.peek(true);
                     if (sepToken.type === tokens_1.StyleTokenType.Comma) {
-                        parser._lexer.get();
+                        this._lexer.get();
                     }
                 }
                 else {
-                    parser.expectToken(tokens_1.StyleTokenType.Comma);
+                    this.expectToken(tokens_1.StyleTokenType.Comma);
                 }
-                sepToken = parser._lexer.peek();
+                sepToken = this._lexer.peek();
                 if (sepToken.type === tokens_1.StyleTokenType.Ws) {
-                    parser._lexer.get();
+                    this._lexer.get();
                 }
             }
             // --- Process the optional separator
-            let aSepToken = parser._lexer.peek();
+            let aSepToken = this._lexer.peek();
             if (aSepToken.type === tokens_1.StyleTokenType.Ws) {
-                parser._lexer.get();
+                this._lexer.get();
             }
             // --- Expect ")"
-            parser.expectToken(tokens_1.StyleTokenType.RParent, "S010");
+            this.expectToken(tokens_1.StyleTokenType.RParent, "S010");
             return true;
+        };
+        switch (startToken.type) {
+            case tokens_1.StyleTokenType.ColorName:
+                this._lexer.get();
+                return this.createNode("Color", {
+                    value: startToken.text.toLowerCase(),
+                }, startToken);
+            case tokens_1.StyleTokenType.HexaColor:
+                this._lexer.get();
+                return this.createNode("Color", {
+                    value: startToken.text,
+                }, startToken);
+            case tokens_1.StyleTokenType.ColorFunc:
+                let success = false;
+                switch (startToken.text) {
+                    case "rgb":
+                        success = parseColorParameters(["V%", "V%", "V%"]);
+                        break;
+                    case "rgba":
+                        success = parseColorParameters(["V%", "V%", "V%", "alpha"]);
+                        break;
+                    case "hsl":
+                        success = parseColorParameters(["angle", "%", "%"]);
+                        break;
+                    case "hsla":
+                        success = parseColorParameters(["angle", "%", "%", "alpha"]);
+                        break;
+                    default:
+                        this.reportError("S006", startToken, startToken.text);
+                        return null;
+                }
+                if (success) {
+                    return {
+                        type: "Color",
+                        startPosition: startToken.start,
+                        endPosition: this._lexer.peek().start,
+                        value: this.getSource(startToken, this._lexer.peek()),
+                    };
+                }
+                return null;
+            default:
+                this.reportError("S005", startToken);
+                return null;
         }
     }
     getNumber() {

package/dist/scripts/src/testing/ComponentDrivers.js

@@ -55,9 +55,7 @@ class ComponentDriver {
      * Gets the html tag name of the final rendered component
      */
     getComponentTagName() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component.evaluate((el) => el.tagName.toLowerCase());
-        });
+        return this.component.evaluate((el) => el.tagName.toLowerCase());
     }
 }
 exports.ComponentDriver = ComponentDriver;
@@ -269,17 +267,13 @@ class SplitterDriver extends ComponentDriver {
      * Gets the primary panel element
      */
     getPrimaryPanel() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.locator.locator('[class*="primaryPanel"]').first();
-        });
+        return this.locator.locator('[class*="primaryPanel"]').first();
     }
     /**
      * Gets the secondary panel element
      */
     getSecondaryPanel() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.locator.locator('[class*="secondaryPanel"]').first();
-        });
+        return this.locator.locator('[class*="secondaryPanel"]').first();
     }
 }
 exports.SplitterDriver = SplitterDriver;
@@ -553,20 +547,16 @@ class FormDriver extends ComponentDriver {
             return requestPromise;
         });
     }
-    getSubmitResponse() {
-        return __awaiter(this, arguments, void 0, function* (endpoint = "/entities", responseStatus = 200, timeout = 5000) {
-            const responsePromise = this.page.waitForResponse((response) => response.url().includes(endpoint) && response.status() === responseStatus, { timeout });
-            return responsePromise;
-        });
+    getSubmitResponse(endpoint = "/entities", responseStatus = 200, timeout = 5000) {
+        const responsePromise = this.page.waitForResponse((response) => response.url().includes(endpoint) && response.status() === responseStatus, { timeout });
+        return responsePromise;
     }
     /**
      * Gets the validation summary component inside the Form.
      * Uses the 'data-validation-summary' attribute to find the component
      */
     getValidationSummary() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component.locator("[data-validation-summary='true']");
-        });
+        return this.component.locator("[data-validation-summary='true']");
     }
     /**
      * Gets the validation display components inside the Form.
@@ -574,18 +564,14 @@ class FormDriver extends ComponentDriver {
      * The attribute contains the severity of the validation.
      */
     getValidationDisplays() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component
-                .locator("[data-validation-summary='true']")
-                .locator("[data-validation-display-severity]");
-        });
+        return this.component
+            .locator("[data-validation-summary='true']")
+            .locator("[data-validation-display-severity]");
     }
     getValidationDisplaysBySeverity(severity) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component
-                .locator("[data-validation-summary='true']")
-                .locator(`[data-validation-display-severity="${severity}"]`);
-        });
+        return this.component
+            .locator("[data-validation-summary='true']")
+            .locator(`[data-validation-display-severity="${severity}"]`);
     }
 }
 exports.FormDriver = FormDriver;
@@ -597,25 +583,19 @@ class ValidationSummaryDriver extends ComponentDriver {
      * The attribute contains the severity of the validation.
      */
     getValidationDisplays() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component
-                .locator("[data-validation-summary='true']")
-                .locator("[data-validation-display-severity]");
-        });
+        return this.component
+            .locator("[data-validation-summary='true']")
+            .locator("[data-validation-display-severity]");
     }
 }
 exports.ValidationSummaryDriver = ValidationSummaryDriver;
 // --- ValidationDisplay
 class ValidationDisplayDriver extends ComponentDriver {
     getSeverity() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component.getAttribute("data-validation-display-severity");
-        });
+        return this.component.getAttribute("data-validation-display-severity");
     }
     getText() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.component.locator("li").textContent();
-        });
+        return this.component.locator("li").textContent();
     }
 }
 exports.ValidationDisplayDriver = ValidationDisplayDriver;
@@ -1376,7 +1356,8 @@ class SliderDriver extends ComponentDriver {
             else if (location === "end") {
                 targetX = trackBox.x + trackBox.width;
             }
-            else { // middle
+            else {
+                // middle
                 targetX = trackBox.x + trackBox.width / 2;
             }
             const targetY = trackBox.y + trackBox.height / 2;

package/dist/scripts/src/testing/component-test-helpers.js

@@ -50,9 +50,7 @@ function mapObject(obj, valFn = ((val) => val), keyFn = ((val) => val)) {
     return newObject;
 }
 function getComponentTagName(locator) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return locator.evaluate((el) => el.tagName.toLowerCase());
-    });
+    return locator.evaluate((el) => el.tagName.toLowerCase());
 }
 function parseComponentIfNecessary(rawComponent) {
     if (typeof rawComponent === "string") {
@@ -78,33 +76,25 @@ function scaleByPercent(scalarOf100Percent, percentage) {
     return (scalarOf100Percent / 100) * parsed.value;
 }
 function getBoundingRect(locator) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return locator.evaluate((element) => element.getBoundingClientRect());
-    });
+    return locator.evaluate((element) => element.getBoundingClientRect());
 }
 function getElementStyle(specifier, style) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return specifier.evaluate((element, style) => window.getComputedStyle(element).getPropertyValue(style), style);
-    });
+    return specifier.evaluate((element, style) => window.getComputedStyle(element).getPropertyValue(style), style);
 }
 /**
  * Retreives all the provided style properties from the locator
  * @returns an object with the keys being the elements of the styles argument
  */
-function getElementStyles(locator_1) {
-    return __awaiter(this, arguments, void 0, function* (locator, styles = []) {
-        return locator.evaluate((element, styles) => Object.fromEntries(styles.map((styleName) => [
-            styleName,
-            window.getComputedStyle(element).getPropertyValue(styleName),
-        ])), styles);
-    });
+function getElementStyles(locator, styles = []) {
+    return locator.evaluate((element, styles) => Object.fromEntries(styles.map((styleName) => [
+        styleName,
+        window.getComputedStyle(element).getPropertyValue(styleName),
+    ])), styles);
 }
 function isIndeterminate(specifier) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (specifier instanceof ComponentDrivers_1.ComponentDriver)
-            specifier = specifier.component;
-        return specifier.evaluate((el) => el.indeterminate);
-    });
+    if (specifier instanceof ComponentDrivers_1.ComponentDriver)
+        specifier = specifier.component;
+    return specifier.evaluate((el) => el.indeterminate);
 }
 function overflows(locator_1) {
     return __awaiter(this, arguments, void 0, function* (locator, direction = "both") {
@@ -125,34 +115,30 @@ function overflows(locator_1) {
 // ComponentDriver style helpers
 // ----------------------------------
 function getStyles(specifier, style) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (specifier instanceof ComponentDrivers_1.ComponentDriver)
-            specifier = specifier.component;
-        style = Array.isArray(style) ? style : [style];
-        return specifier.evaluate((element, styles) => Object.fromEntries(styles.map((styleName) => [
-            styleName
-                .trim()
-                .split("-")
-                .map((n, idx) => (idx === 0 ? n : n[0].toUpperCase() + n.slice(1)))
-                .join(""),
-            window.getComputedStyle(element).getPropertyValue(styleName),
-        ])), style);
-    });
+    if (specifier instanceof ComponentDrivers_1.ComponentDriver)
+        specifier = specifier.component;
+    style = Array.isArray(style) ? style : [style];
+    return specifier.evaluate((element, styles) => Object.fromEntries(styles.map((styleName) => [
+        styleName
+            .trim()
+            .split("-")
+            .map((n, idx) => (idx === 0 ? n : n[0].toUpperCase() + n.slice(1)))
+            .join(""),
+        window.getComputedStyle(element).getPropertyValue(styleName),
+    ])), style);
 }
 function getPseudoStyles(specifier, pseudoElement, style) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (specifier instanceof ComponentDrivers_1.ComponentDriver)
-            specifier = specifier.component;
-        style = Array.isArray(style) ? style : [style];
-        return specifier.evaluate((element, obj) => Object.fromEntries(obj.style.map((styleName) => [
-            styleName
-                .trim()
-                .split("-")
-                .map((n, idx) => (idx === 0 ? n : n[0].toUpperCase() + n.slice(1)))
-                .join(""),
-            window.getComputedStyle(element, obj.pseudoElement).getPropertyValue(styleName),
-        ])), { style, pseudoElement });
-    });
+    if (specifier instanceof ComponentDrivers_1.ComponentDriver)
+        specifier = specifier.component;
+    style = Array.isArray(style) ? style : [style];
+    return specifier.evaluate((element, obj) => Object.fromEntries(obj.style.map((styleName) => [
+        styleName
+            .trim()
+            .split("-")
+            .map((n, idx) => (idx === 0 ? n : n[0].toUpperCase() + n.slice(1)))
+            .join(""),
+        window.getComputedStyle(element, obj.pseudoElement).getPropertyValue(styleName),
+    ])), { style, pseudoElement });
 }
 function getHtmlAttributes(specifier, attributes) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -188,9 +174,7 @@ function getBorders(specifier) {
     });
 }
 function getMargins(specifier) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return getStyles(specifier, ["margin-left", "margin-right", "margin-top", "margin-bottom"]);
-    });
+    return getStyles(specifier, ["margin-left", "margin-right", "margin-top", "margin-bottom"]);
 }
 /**
  * Retrieves the bounding rectangle of the component including **margins** and **padding**