xmlui 0.9.86 → 0.9.88

package/dist/scripts/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xmlui",
-    "version": "0.9.86",
+    "version": "0.9.88",
     "sideEffects": false,
     "scripts": {
         "start-test-bed": "cd src/testing/infrastructure && xmlui start",

package/dist/scripts/src/components/Backdrop/Backdrop.js

@@ -22,17 +22,19 @@ exports.BackdropMd = (0, metadata_helpers_1.createMetadata)({
         backgroundColor: {
             description: "The background color of the backdrop.",
             valueType: "string",
-            defaultValue: BackdropNative_1.defaultProps.backgroundColor,
         },
         opacity: {
             description: "The opacity of the backdrop.",
             valueType: "string",
-            defaultValue: BackdropNative_1.defaultProps.opacity,
         },
     },
     themeVars: (0, themeVars_1.parseScssVar)(Backdrop_module_scss_1.default.themeVars),
+    defaultThemeVars: {
+        [`backgroundColor-${COMP}`]: "black",
+        [`opacity-${COMP}`]: "0.1",
+    }
 });
 exports.backdropComponentRenderer = (0, renderers_1.createComponentRenderer)(COMP, exports.BackdropMd, ({ node, extractValue, renderChild, layoutCss }) => {
     var _a;
-    return ((0, jsx_runtime_1.jsx)(BackdropNative_1.Backdrop, { style: layoutCss, overlayTemplate: renderChild((_a = node.props) === null || _a === void 0 ? void 0 : _a.overlayTemplate), backgroundColor: extractValue.asOptionalString(node.props.backgroundColor), opacity: extractValue.asString(node.props.opacity), children: renderChild(node.children) }));
+    return ((0, jsx_runtime_1.jsx)(BackdropNative_1.Backdrop, { style: layoutCss, overlayTemplate: renderChild((_a = node.props) === null || _a === void 0 ? void 0 : _a.overlayTemplate), backgroundColor: extractValue.asOptionalString(node.props.backgroundColor, undefined), opacity: extractValue.asOptionalString(node.props.opacity, undefined), children: renderChild(node.children) }));
 });

package/dist/scripts/src/components/Backdrop/BackdropNative.js

@@ -3,15 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Backdrop = exports.defaultProps = void 0;
+exports.Backdrop = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const Backdrop_module_scss_1 = __importDefault(require("./Backdrop.module.scss"));
-exports.defaultProps = {
-    backgroundColor: "black",
-    opacity: "0.1",
-};
-exports.Backdrop = (0, react_1.forwardRef)(function Backdrop({ style, children, overlayTemplate, backgroundColor = exports.defaultProps.backgroundColor, opacity = exports.defaultProps.opacity, }, forwardedRef) {
+exports.Backdrop = (0, react_1.forwardRef)(function Backdrop({ style, children, overlayTemplate, backgroundColor, opacity, }, forwardedRef) {
     var _a;
     const styleWithoutDims = Object.assign(Object.assign({}, style), { width: undefined });
     return ((0, jsx_runtime_1.jsxs)("div", { className: Backdrop_module_scss_1.default.backdropContainer, style: { width: (_a = style.width) !== null && _a !== void 0 ? _a : "fit-content" }, ref: forwardedRef, children: [children, (0, jsx_runtime_1.jsx)("div", { className: Backdrop_module_scss_1.default.backdrop, style: Object.assign(Object.assign({}, styleWithoutDims), { backgroundColor, opacity }) }), overlayTemplate && (0, jsx_runtime_1.jsx)("div", { className: Backdrop_module_scss_1.default.overlay, children: overlayTemplate })] }));

package/dist/scripts/src/components/Markdown/parse-binding-expr.js

@@ -10,21 +10,33 @@ const ScriptingSourceTree_1 = require("../../components-core/script-runner/Scrip
  * @returns the parsed text with resolved binding expressions
  */
 function parseBindingExpression(text, extractValue) {
-    // Remove empty @{} expressions first
-    text = text.replaceAll(/(?<!\\)\@\{\s*\}/g, "");
-    // The (?<!\\) is a "negative lookbehind" in regex that ensures that
-    // if escaping the @{...} expression like this: \@{...}, we don't match it
-    const regex = /(?<!\\)\@\{((?:[^{}]|\{(?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*\})*)\}/g;
-    const result = text.replace(regex, (_, expr) => {
-        const extracted = extractValue(`{${expr}}`);
-        const resultExpr = mapByType(extracted);
-        // The result expression might be an object, in that case we stringify it here,
-        // at the last step, so that there are no unnecessary apostrophes
-        return typeof resultExpr === "object" && resultExpr !== null
-            ? JSON.stringify(resultExpr)
-            : resultExpr;
-    });
-    return result;
+    // Remove empty @{} expressions first - Safari/Edge compatible version
+    text = text.replaceAll(/(^|[^\\])\@\{\s*\}/g, "$1");
+    // Safari/Edge compatible iterative processing to handle adjacent bindings
+    // Process content bindings one at a time to avoid position conflicts
+    let previousText = "";
+    let iterations = 0;
+    while (text !== previousText && iterations < 100) { // Safety limit
+        previousText = text;
+        iterations++;
+        // Match first non-escaped @{...} with nested braces support
+        const match = text.match(/(^|[^\\])(\@\{((?:[^{}]|\{(?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*\})*)\})/);
+        if (match) {
+            const fullMatch = match[0];
+            const prefix = match[1];
+            const expr = match[3];
+            const extracted = extractValue(`{${expr}}`);
+            const resultExpr = mapByType(extracted);
+            const replacement = typeof resultExpr === "object" && resultExpr !== null
+                ? JSON.stringify(resultExpr)
+                : resultExpr;
+            text = text.replace(fullMatch, prefix + replacement);
+        }
+        else {
+            break; // No more matches
+        }
+    }
+    return text;
     // ---
     function mapByType(extracted) {
         if (extracted === null) {

package/dist/scripts/src/components/Switch/Switch.js

@@ -15,7 +15,6 @@ exports.SwitchMd = (0, metadata_helpers_1.createMetadata)({
     status: "stable",
     description: "`Switch` enables users to toggle between two states: on and off.",
     props: {
-        indeterminate: (0, metadata_helpers_1.dIndeterminate)(Toggle_1.defaultProps.indeterminate),
         label: (0, metadata_helpers_1.dLabel)(),
         labelPosition: (0, metadata_helpers_1.dLabelPosition)("end"),
         labelWidth: (0, metadata_helpers_1.dLabelWidth)(COMP),
@@ -72,5 +71,5 @@ exports.SwitchMd = (0, metadata_helpers_1.createMetadata)({
     },
 });
 exports.switchComponentRenderer = (0, renderers_1.createComponentRenderer)(COMP, exports.SwitchMd, ({ node, extractValue, layoutCss, updateState, state, lookupEventHandler, registerComponentApi, }) => {
-    return ((0, jsx_runtime_1.jsx)(Toggle_1.Toggle, { enabled: extractValue.asOptionalBoolean(node.props.enabled), style: layoutCss, initialValue: extractValue.asOptionalBoolean(node.props.initialValue, Toggle_1.defaultProps.initialValue), value: state === null || state === void 0 ? void 0 : state.value, readOnly: extractValue.asOptionalBoolean(node.props.readOnly), validationStatus: extractValue(node.props.validationStatus), updateState: updateState, onDidChange: lookupEventHandler("didChange"), onFocus: lookupEventHandler("gotFocus"), onBlur: lookupEventHandler("lostFocus"), label: extractValue(node.props.label), labelPosition: extractValue(node.props.labelPosition), labelWidth: extractValue(node.props.labelWidth), labelBreak: extractValue.asOptionalBoolean(node.props.labelBreak), required: extractValue.asOptionalBoolean(node.props.required), variant: "switch", registerComponentApi: registerComponentApi }));
+    return ((0, jsx_runtime_1.jsx)(Toggle_1.Toggle, { enabled: extractValue.asOptionalBoolean(node.props.enabled), style: layoutCss, initialValue: extractValue.asOptionalBoolean(node.props.initialValue, Toggle_1.defaultProps.initialValue), value: state === null || state === void 0 ? void 0 : state.value, readOnly: extractValue.asOptionalBoolean(node.props.readOnly), validationStatus: extractValue(node.props.validationStatus), updateState: updateState, autoFocus: extractValue.asOptionalBoolean(node.props.autoFocus), onDidChange: lookupEventHandler("didChange"), onFocus: lookupEventHandler("gotFocus"), onBlur: lookupEventHandler("lostFocus"), label: extractValue(node.props.label), labelPosition: extractValue(node.props.labelPosition), labelWidth: extractValue(node.props.labelWidth), labelBreak: extractValue.asOptionalBoolean(node.props.labelBreak), required: extractValue.asOptionalBoolean(node.props.required), variant: "switch", registerComponentApi: registerComponentApi }));
 });

package/dist/scripts/src/parsers/xmlui-parser/diagnostics.js

@@ -26,6 +26,9 @@ var ErrCodes;
     ErrCodes["expTagNameAfterNamespace"] = "U014";
     ErrCodes["expCloseStartWithName"] = "U015";
     ErrCodes["expAttrNameAfterNamespace"] = "U016";
+    ErrCodes["unexpectedCloseTag"] = "U017";
+    ErrCodes["expTagNameAfterCloseStart"] = "U019";
+    ErrCodes["expAttrNameBeforeEq"] = "U020";
     ErrCodes["invalidChar"] = "W001";
     ErrCodes["untermStr"] = "W002";
     ErrCodes["untermComment"] = "W007";
@@ -33,6 +36,11 @@ var ErrCodes;
     ErrCodes["untermScript"] = "W009";
 })(ErrCodes || (exports.ErrCodes = ErrCodes = {}));
 exports.DIAGS = {
+    unexpectedCloseTag: {
+        category: DiagnosticCategory.Error,
+        code: ErrCodes.unexpectedCloseTag,
+        message: "Read '</', but there's no opening tag to close. You have too many closing tags.",
+    },
     expCloseStartWithName: function (openTagName) {
         return {
             category: DiagnosticCategory.Error,
@@ -108,16 +116,30 @@ exports.DIAGS = {
         code: ErrCodes.expAttrName,
         message: `An attribute name expected.`,
     },
-    expAttrNameAfterNamespace: {
+    expAttrNameAfterNamespace: function (namespaceName) {
+        return {
+            category: DiagnosticCategory.Error,
+            code: ErrCodes.expAttrNameAfterNamespace,
+            message: `An attribute name expected after namespace '${namespaceName}'.`,
+        };
+    },
+    expTagNameAfterNamespace: function (namespaceName) {
+        return {
+            category: DiagnosticCategory.Error,
+            code: ErrCodes.expTagNameAfterNamespace,
+            message: `A tag name expected after namespace '${namespaceName}'.`,
+        };
+    },
+    expTagNameAfterCloseStart: {
         category: DiagnosticCategory.Error,
-        code: ErrCodes.expAttrNameAfterNamespace,
-        message: `An attribute name expected after a namespaces.`,
+        code: ErrCodes.expTagNameAfterCloseStart,
+        message: "Expected tag name after '</'.",
     },
-    expTagNameAfterNamespace: {
+    expAttrNameBeforeEq: {
         category: DiagnosticCategory.Error,
-        code: ErrCodes.expTagNameAfterNamespace,
-        message: `A tag name expected after a namespaces.`,
-    }
+        code: ErrCodes.expAttrNameBeforeEq,
+        message: "Expected attribute name before '='.",
+    },
 };
 function diagnosticCategoryName(d, lowerCase = true) {
     const name = DiagnosticCategory[d.category];

package/dist/scripts/src/parsers/xmlui-parser/parser.js

@@ -73,7 +73,7 @@ function parseXmlUiMarkup(text) {
                     break;
                 default:
                     const errNode = errNodeUntil(RECOVER_FILE);
-                    errorAt(diagnostics_1.DIAGS.expTagOpen, errNode.pos, errNode.end);
+                    errorAt(diagnostics_1.DIAGS.unexpectedCloseTag, errNode.pos, errNode.end);
                     break;
             }
         }
@@ -152,10 +152,11 @@ function parseXmlUiMarkup(text) {
     }
     function parseOpeningTagName() {
         startNode();
-        bump(syntax_kind_1.SyntaxKind.Identifier);
+        const identNode = bump(syntax_kind_1.SyntaxKind.Identifier);
         if (eat(syntax_kind_1.SyntaxKind.Colon) && !eat(syntax_kind_1.SyntaxKind.Identifier)) {
             const nameNodeWithColon = completeNode(syntax_kind_1.SyntaxKind.TagNameNode);
-            errorAt(diagnostics_1.DIAGS.expTagNameAfterNamespace, nameNodeWithColon.pos, nameNodeWithColon.end);
+            const namespaceName = getText(identNode);
+            errorAt(diagnostics_1.DIAGS.expTagNameAfterNamespace(namespaceName), nameNodeWithColon.pos, nameNodeWithColon.end);
             errNodeUntil([syntax_kind_1.SyntaxKind.Identifier, ...RECOVER_OPEN_TAG]);
             return { node: nameNodeWithColon, errInName: true };
         }
@@ -196,7 +197,12 @@ function parseXmlUiMarkup(text) {
         else {
             const errNode = errNodeUntil(RECOVER_ATTR);
             if (errNode) {
-                errorAt(diagnostics_1.DIAGS.expAttrName, errNode.pos, errNode.end);
+                if (at(syntax_kind_1.SyntaxKind.Equal)) {
+                    errorAt(diagnostics_1.DIAGS.expAttrNameBeforeEq, errNode.pos, errNode.end);
+                }
+                else {
+                    errorAt(diagnostics_1.DIAGS.expAttrName, errNode.pos, errNode.end);
+                }
                 completeNode(syntax_kind_1.SyntaxKind.AttributeNode);
             }
             else {
@@ -229,16 +235,17 @@ function parseXmlUiMarkup(text) {
                 nameIdent = bump(syntax_kind_1.SyntaxKind.Identifier);
             }
             else {
+                const namespaceName = getText(nameIdent);
                 const errNode = errNodeUntil([
                     syntax_kind_1.SyntaxKind.Equal,
                     syntax_kind_1.SyntaxKind.Identifier,
                     ...RECOVER_OPEN_TAG,
                 ]);
                 if (errNode) {
-                    errorAt(diagnostics_1.DIAGS.expAttrNameAfterNamespace, errNode.pos, errNode.end);
+                    errorAt(diagnostics_1.DIAGS.expAttrNameAfterNamespace(namespaceName), errNode.pos, errNode.end);
                 }
                 else {
-                    error(diagnostics_1.DIAGS.expAttrNameAfterNamespace);
+                    error(diagnostics_1.DIAGS.expAttrNameAfterNamespace(namespaceName));
                 }
             }
         }
@@ -261,10 +268,10 @@ function parseXmlUiMarkup(text) {
             else {
                 const errNode = errNodeUntil(RECOVER_CLOSE_TAG);
                 if (errNode) {
-                    errorAt(diagnostics_1.DIAGS.expTagName, errNode.pos, errNode.end);
+                    errorAt(diagnostics_1.DIAGS.expTagNameAfterCloseStart, errNode.pos, errNode.end);
                 }
                 else {
-                    error(diagnostics_1.DIAGS.expTagName);
+                    error(diagnostics_1.DIAGS.expTagNameAfterCloseStart);
                 }
             }
             if (!eat(syntax_kind_1.SyntaxKind.NodeEnd)) {
@@ -282,10 +289,10 @@ function parseXmlUiMarkup(text) {
     }
     function parseClosingTagName() {
         startNode();
-        bump(syntax_kind_1.SyntaxKind.Identifier);
+        const identNode = bump(syntax_kind_1.SyntaxKind.Identifier);
         if (eat(syntax_kind_1.SyntaxKind.Colon) && !eat(syntax_kind_1.SyntaxKind.Identifier)) {
             const nameNodeWithColon = completeNode(syntax_kind_1.SyntaxKind.TagNameNode);
-            errorAt(diagnostics_1.DIAGS.expTagNameAfterNamespace, nameNodeWithColon.pos, nameNodeWithColon.end);
+            errorAt(diagnostics_1.DIAGS.expTagNameAfterNamespace(getText(identNode)), nameNodeWithColon.pos, nameNodeWithColon.end);
             errNodeUntil(RECOVER_OPEN_TAG);
             return nameNodeWithColon;
         }

package/dist/standalone/xmlui-standalone.es.d.ts

@@ -621,6 +621,9 @@ declare enum ErrCodes {
     expTagNameAfterNamespace = "U014",
     expCloseStartWithName = "U015",
     expAttrNameAfterNamespace = "U016",
+    unexpectedCloseTag = "U017",
+    expTagNameAfterCloseStart = "U019",
+    expAttrNameBeforeEq = "U020",
     invalidChar = "W001",
     untermStr = "W002",
     untermComment = "W007",