meno-core 1.1.5 → 1.1.6

package/dist/lib/client/index.js

@@ -1,6 +1,8 @@
 import {
+  TEMPLATE_VARS_KEY,
   evaluateTemplate,
   extractAttributesFromNode,
+  getTemplateVars,
   hasTemplates,
   inlineSvgStyleRules,
   isHtmlMapping,
@@ -13,7 +15,7 @@ import {
   resolveLinkMapping,
   resolveStyleMapping,
   skipEmptyTemplateAttributes
-} from "../../chunks/chunk-H6EOTPJA.js";
+} from "../../chunks/chunk-GHNLTFCN.js";
 import {
   filterCSSProperties
 } from "../../chunks/chunk-XTKNX4FW.js";
@@ -58,6 +60,7 @@ import {
   logNetworkError,
   logRuntimeError,
   markAsSlotContent,
+  mergeInstanceClasses,
   mergeResponsiveStyles,
   normalizeBreakpointConfig,
   pathToString,
@@ -71,9 +74,10 @@ import {
   setGlobalTemplateContext,
   singularize,
   sortClassesByPropertyOrder,
+  stripClassOverriddenStyleProps,
   toFriendlyError,
   validatePageData
-} from "../../chunks/chunk-RLBV2R6J.js";
+} from "../../chunks/chunk-KX2LPIZZ.js";
 import {
   DEFAULT_I18N_CONFIG,
   isI18nValue,
@@ -1063,6 +1067,12 @@ function buildEmbed(node, ctx, deps) {
             el.style.setProperty(varName, value);
           }
         }
+        const templateVars = getTemplateVars(node);
+        if (templateVars) {
+          for (const [varName, value] of Object.entries(templateVars)) {
+            el.style.setProperty(varName, value);
+          }
+        }
       }
     },
     dangerouslySetInnerHTML: { __html: sanitizedHtml }
@@ -1142,7 +1152,9 @@ function buildEmbed(node, ctx, deps) {
   if ("class" in extractedAttributes || "className" in extractedAttributes) {
     const attrClass = extractedAttributes.class ?? extractedAttributes.className ?? "";
     if (attrClass) {
-      classNames.push(...attrClass.split(/\s+/));
+      const classTokens = attrClass.split(/\s+/).filter(Boolean);
+      UtilityClassCollector.collect(classTokens);
+      classNames.push(...classTokens);
     }
     delete extractedAttributes.class;
     delete extractedAttributes.className;
@@ -1205,6 +1217,12 @@ function buildLinkNode(node, children, ctx, deps) {
             el.style.setProperty(varName, value);
           }
         }
+        const templateVars = getTemplateVars(node);
+        if (templateVars) {
+          for (const [varName, value] of Object.entries(templateVars)) {
+            el.style.setProperty(varName, value);
+          }
+        }
       }
     }
   };
@@ -1283,7 +1301,9 @@ function buildLinkNode(node, children, ctx, deps) {
   if ("class" in extractedAttributes || "className" in extractedAttributes) {
     const attrClass = extractedAttributes.class ?? extractedAttributes.className ?? "";
     if (attrClass) {
-      classNames.push(...attrClass.split(/\s+/));
+      const classTokens = attrClass.split(/\s+/).filter(Boolean);
+      UtilityClassCollector.collect(classTokens);
+      classNames.push(...classTokens);
     }
     delete extractedAttributes.class;
     delete extractedAttributes.className;
@@ -1360,6 +1380,12 @@ function buildLocaleList(node, ctx, deps) {
             el.style.setProperty(varName, value);
           }
         }
+        const templateVars = getTemplateVars(node);
+        if (templateVars) {
+          for (const [varName, value] of Object.entries(templateVars)) {
+            el.style.setProperty(varName, value);
+          }
+        }
       }
     }
   };
@@ -1425,7 +1451,9 @@ function buildLocaleList(node, ctx, deps) {
   if ("class" in extractedAttributes || "className" in extractedAttributes) {
     const attrClass = extractedAttributes.class ?? extractedAttributes.className ?? "";
     if (attrClass) {
-      classNames.push(...attrClass.split(/\s+/));
+      const classTokens = attrClass.split(/\s+/).filter(Boolean);
+      UtilityClassCollector.collect(classTokens);
+      classNames.push(...classTokens);
     }
     delete extractedAttributes.class;
     delete extractedAttributes.className;
@@ -2545,6 +2573,10 @@ var ComponentBuilder = class {
    */
   applyStyleClasses(props, node, ctx) {
     const nodeStyle = node.style || (isComponentNode(node) ? node.props?.style : void 0);
+    const templateVars = getTemplateVars(node);
+    if (templateVars) {
+      props = { ...props, [TEMPLATE_VARS_KEY]: templateVars };
+    }
     if (nodeStyle && typeof nodeStyle === "object") {
       let processedStyle = nodeStyle;
       const templateCtx = ctx.templateContext || ctx.itemContext;
@@ -2803,14 +2835,19 @@ var ComponentBuilder = class {
       const instanceClass = typeof finalProps.class === "string" ? finalProps.class : "";
       if (instanceClass) {
         const root = processedStructure;
+        if (root.style) {
+          const stripped = stripClassOverriddenStyleProps(root.style, instanceClass);
+          if (stripped) root.style = stripped;
+          else delete root.style;
+        }
         if (isHtmlNode(root) || isLinkNode(root)) {
           if (!root.attributes) root.attributes = {};
-          const existing = root.attributes.class || "";
-          root.attributes.class = existing ? `${existing} ${instanceClass}` : instanceClass;
+          const own = (root.attributes.class || "").split(/\s+/).filter(Boolean);
+          root.attributes.class = mergeInstanceClasses(own, instanceClass).join(" ");
         } else {
           if (!root.props) root.props = {};
-          const existing = root.props.className || "";
-          root.props.className = existing ? `${existing} ${instanceClass}` : instanceClass;
+          const own = (root.props.className || "").split(/\s+/).filter(Boolean);
+          root.props.className = mergeInstanceClasses(own, instanceClass).join(" ");
         }
         const tokens = instanceClass.split(/\s+/).filter(Boolean);
         if (tokens.length > 0) UtilityClassCollector.collect(tokens);
@@ -2877,10 +2914,12 @@ var ComponentBuilder = class {
     const effectiveParentComponentName = this.getEffectiveParentComponentName(componentContext, parentComponentName);
     const { __componentProps, ...customPropsForDOM } = customProps || {};
     const isComponentRoot = !!(customProps && "__componentProps" in customProps);
-    let propsForElement = props;
-    const nodeStyle = props.style;
+    const { [TEMPLATE_VARS_KEY]: templateVarsRaw, ...propsSansTemplateVars } = props;
+    const templateVars = templateVarsRaw;
+    let propsForElement = propsSansTemplateVars;
+    const nodeStyle = propsSansTemplateVars.style;
     if (nodeStyle && typeof nodeStyle === "object" && ("base" in nodeStyle || "tablet" in nodeStyle || "mobile" in nodeStyle)) {
-      const { style: _, ...rest } = props;
+      const { style: _, ...rest } = propsSansTemplateVars;
       propsForElement = rest;
     }
     const processedProps = {
@@ -2935,6 +2974,11 @@ var ComponentBuilder = class {
             el.style.setProperty(varName, value);
           }
         }
+        if (templateVars) {
+          for (const [varName, value] of Object.entries(templateVars)) {
+            el.style.setProperty(varName, value);
+          }
+        }
       }
       const componentProps = isComponentRoot && customProps.__componentProps ? customProps.__componentProps : void 0;
       const componentNameForRegistry = isComponentRoot ? componentContext : parentComponentName;