@riverbankcms/sdk 0.60.9 → 0.60.11

package/dist/server/components.mjs

@@ -1335,6 +1335,9 @@ function validationContext(options = {}) {
     allowIncomplete: isDraft || (options.allowIncomplete ?? false)
   };
 }
+function formatFieldPath(path) {
+  return path.map((segment) => String(segment)).join(".");
+}
 function fieldIssueToMessage(issue2) {
   switch (issue2.kind) {
     case "required":
@@ -1558,7 +1561,7 @@ function normalizeRepeaterItems(plan, value, ctx) {
     return normalizeObjectChildren(fields3, itemRecord, ctx);
   });
 }
-function normalizeNumberInput(value, allowNull) {
+function normalizeNumberInput(value, _allowNull) {
   if (value === "") return void 0;
   if (typeof value === "string" && value.trim() !== "") return Number(value);
   return value;
@@ -1690,7 +1693,7 @@ function validateRepeaterItem(plan, item, index, ctx) {
   const fields3 = plan.repeatedItemVariants ? plan.repeatedItemVariants.find((variant) => variant.typeId === itemType)?.fields : plan.repeatedItemPlan;
   if (!fields3) return [];
   return fields3.flatMap((childPlan) => {
-    const indexedPlan = withIndexedPath(childPlan, plan.path, index);
+    const indexedPlan = materializeRepeaterItemPlan(childPlan, plan.path, index);
     return validateNormalizedFieldValue(indexedPlan, item[childPlan.fieldId], ctx);
   });
 }
@@ -1702,12 +1705,58 @@ function validateGroupPlan(plan, value, ctx) {
 function childValidationContext(plan, ctx) {
   return plan.allowNullChildren ? { ...ctx, allowNull: true } : ctx;
 }
-function withIndexedPath(plan, parentPath, index) {
-  const suffix = plan.path.slice(parentPath.length + 1);
-  return {
-    ...plan,
-    path: [...parentPath, index, plan.fieldId, ...suffix]
-  };
+function materializeRepeaterItemPlan(plan, parentPath, index) {
+  return rebaseFieldPlanPath(plan, [...parentPath, 0], [...parentPath, index]);
+}
+function rebaseFieldPlanPath(plan, fromPrefix, toPrefix) {
+  const path = rebaseFieldPath(plan.path, fromPrefix, toPrefix);
+  switch (plan.kind) {
+    case "group":
+      return {
+        ...plan,
+        path,
+        children: plan.children.map((childPlan) => rebaseFieldPlanPath(childPlan, fromPrefix, toPrefix))
+      };
+    case "repeater":
+      return {
+        ...plan,
+        path,
+        ...plan.repeatedItemVariants ? {
+          repeatedItemVariants: plan.repeatedItemVariants.map((variant) => ({
+            ...variant,
+            fields: variant.fields.map((fieldPlan) => rebaseFieldPlanPath(fieldPlan, fromPrefix, toPrefix))
+          }))
+        } : {},
+        ...plan.repeatedItemPlan ? {
+          repeatedItemPlan: plan.repeatedItemPlan.map(
+            (fieldPlan) => rebaseFieldPlanPath(fieldPlan, fromPrefix, toPrefix)
+          )
+        } : {}
+      };
+    case "string":
+    case "number":
+    case "boolean":
+    case "richText":
+    case "media":
+    case "link":
+    case "select":
+    case "passthrough":
+      return {
+        ...plan,
+        path
+      };
+    default:
+      return assertNever2(plan);
+  }
+}
+function rebaseFieldPath(path, fromPrefix, toPrefix) {
+  if (!startsWithFieldPath(path, fromPrefix)) {
+    throw new Error(`Cannot rebase field path ${formatFieldPath(path)} from ${formatFieldPath(fromPrefix)}`);
+  }
+  return [...toPrefix, ...path.slice(fromPrefix.length)];
+}
+function startsWithFieldPath(path, prefix) {
+  return prefix.every((segment, index) => path[index] === segment);
 }
 function issue(plan, kind, extra) {
   return {
@@ -2218,6 +2267,15 @@ var VARIANT_ROLES = [
   "tertiary",
   "accent"
 ];
+function isVariantRole(value) {
+  return VARIANT_ROLES.includes(value);
+}
+function asSpecialVariantId(value) {
+  if (value.length === 0) {
+    throw new Error("SpecialVariantId must be a non-empty string");
+  }
+  return value;
+}
 var DEFAULT_VARIANT_ALIAS_ID = "default";
 var cornerStyleSchema = z6.enum(["square", "rounded", "pill"]);
 var shadowSizeSchema = z6.enum(["none", "low", "medium", "high"]);
@@ -2968,6 +3026,42 @@ var mediaSchema = z9.object({
   transform: transformSchema.optional()
 });
 
+// ../theme-core/src/buttons/classNames.ts
+function parseThemeButtonVariantId(value) {
+  const normalized = value?.trim() ?? "";
+  if (normalized.length === 0) {
+    return null;
+  }
+  if (normalized === DEFAULT_VARIANT_ALIAS_ID) {
+    return DEFAULT_VARIANT_ALIAS_ID;
+  }
+  return isVariantRole(normalized) ? normalized : asSpecialVariantId(normalized);
+}
+function themeButtonVariantClassNames(variant) {
+  if (variant === DEFAULT_VARIANT_ALIAS_ID) {
+    return [variant];
+  }
+  return [variant, `button-${variant}`];
+}
+function themeButtonSizeClassName(size) {
+  return `btn-${size}`;
+}
+function themeButtonSelector(variant, size) {
+  const baseSelector = `.${variant}`;
+  if (!size) {
+    return baseSelector;
+  }
+  return `${baseSelector}.${themeButtonSizeClassName(size)}`;
+}
+function themeButtonClassName(spec) {
+  const classes = [
+    ...themeButtonVariantClassNames(spec.variant),
+    themeButtonSizeClassName(spec.size),
+    spec.extraClassName
+  ];
+  return classes.filter(Boolean).join(" ");
+}
+
 // ../theme-core/src/tokens/resolver.ts
 var TokenResolver = class {
   constructor(theme) {
@@ -4539,17 +4633,25 @@ function resolveAliasSource(enabled) {
 }
 function variantChunks(variant, global, themeSizes, themeId, tokens, theme) {
   const out = [];
-  out.push(variantBaseRule(variant, global, themeId, tokens, theme));
-  const hoverBg = variantHoverBackgroundRule(variant, global, themeId, tokens);
+  const variantId = parseButtonVariantIdForCss(variant.id);
+  out.push(variantBaseRule(variant, variantId, global, themeId, tokens, theme));
+  const hoverBg = variantHoverBackgroundRule(variant, variantId, global, themeId, tokens);
   if (hoverBg) out.push(hoverBg);
   const effects = variantEffectsCss(variant, themeId, tokens, theme);
   if (effects) out.push({ raw: effects });
-  out.push(...variantDisabledRules(variant, themeId));
-  out.push(...variantSizeRules(variant, themeSizes, themeId));
+  out.push(...variantDisabledRules(variantId, themeId));
+  out.push(...variantSizeRules(variant, variantId, themeSizes, themeId));
   return out;
 }
-function variantBaseRule(variant, global, themeId, tokens, theme) {
-  const selector = `:where([data-theme-scope="${themeId}"]) .${variant.id}`;
+function parseButtonVariantIdForCss(value) {
+  const variantId = parseThemeButtonVariantId(value);
+  if (!variantId) {
+    throw new Error("Button variant id must be a non-empty string");
+  }
+  return variantId;
+}
+function variantBaseRule(variant, variantId, global, themeId, tokens, theme) {
+  const selector = `:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}`;
   const decls = [];
   decls.push(["font-weight", String(global.fontWeight)]);
   decls.push(["font-family", resolveFontFamily(global)]);
@@ -4582,13 +4684,13 @@ function variantBaseRule(variant, global, themeId, tokens, theme) {
   }
   return rule(selector, decls);
 }
-function variantHoverBackgroundRule(variant, global, themeId, tokens) {
+function variantHoverBackgroundRule(variant, variantId, global, themeId, tokens) {
   let hoverToken = variant.hoverBackgroundToken;
   if (!hoverToken && global.hoverColor === "token" && global.hoverColorToken) {
     hoverToken = global.hoverColorToken;
   }
   if (!hoverToken) return null;
-  return rule(`:where([data-theme-scope="${themeId}"]) .${variant.id}:hover`, [
+  return rule(`:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}:hover`, [
     ["background-color", tokens.getColor(hoverToken)]
   ]);
 }
@@ -4608,8 +4710,8 @@ function variantEffectsCss(variant, themeId, tokens, theme) {
     theme
   });
 }
-function variantDisabledRules(variant, themeId) {
-  const base = `:where([data-theme-scope="${themeId}"]) .${variant.id}:disabled`;
+function variantDisabledRules(variantId, themeId) {
+  const base = `:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId)}:disabled`;
   const disabledSelectors = [base, `${base}:hover`, `${base}:active`, `${base}:focus`];
   const pseudoSelectors = [`${base}::before`, `${base}::after`];
   return [
@@ -4627,12 +4729,12 @@ function variantDisabledRules(variant, themeId) {
     ])
   ];
 }
-function variantSizeRules(variant, themeSizes, themeId) {
+function variantSizeRules(variant, variantId, themeSizes, themeId) {
   const borderWidth = variant.border ? BORDER_WIDTH_MAP[variant.border.widthClass] || "1px" : "0px";
   const rules = [];
   for (const sizeName of BUTTON_SIZE_NAMES) {
     const config = resolveSizeConfig(variant, sizeName, themeSizes);
-    const selector = `:where([data-theme-scope="${themeId}"]) .${variant.id}.btn-${sizeName}`;
+    const selector = `:where([data-theme-scope="${themeId}"]) ${themeButtonSelector(variantId, sizeName)}`;
     const decls = [];
     for (const decl of paddingDeclarations(config.padding, borderWidth)) decls.push(decl);
     if (config.fontSize) {
@@ -19705,14 +19807,6 @@ function CalendarIcon({
   );
 }
 
-// ../blocks/src/system/runtime/shared/themedButtonClass.ts
-function themedButtonClass(spec) {
-  const { variant, size, extraClassName } = spec;
-  const normalizedVariant = variant.trim();
-  const variantClasses = normalizedVariant ? [normalizedVariant, `button-${normalizedVariant}`] : [];
-  return [...variantClasses, `btn-${size}`, extraClassName].filter(Boolean).join(" ");
-}
-
 // ../blocks/src/system/runtime/nodes/events/shared/EventCard.tsx
 import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
 var EventCard = ({
@@ -19740,7 +19834,7 @@ var EventCard = ({
   const isSoldOut = cta.hidden;
   const { available: spotsLeft } = getEventAvailability(event);
   const cardClass = `card-${cardVariant}`;
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   const title = event.title;
   const summary = event.presentation?.summary ?? event.description;
   const image = event.presentation?.image ?? null;
@@ -19859,7 +19953,7 @@ var EventCompactRow = ({
   const price = formatEventPrice(event);
   const teacherLine = formatEventTeacherLine(event);
   const cta = resolveEventCta(event, buttonText);
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "sm" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "sm" });
   return /* @__PURE__ */ jsxs3("div", { className: "event-compact-row", children: [
     /* @__PURE__ */ jsxs3("div", { className: "event-compact-row-content", children: [
       /* @__PURE__ */ jsxs3("div", { className: "event-compact-row-top", children: [
@@ -26549,11 +26643,12 @@ var ButtonNode = ({
     }
     return null;
   }
-  const resolvedVariantId = typeof variantId === "string" ? variantId.trim() : "";
-  const normalizedVariantId = resolvedVariantId === DEFAULT_VARIANT_ALIAS_ID ? "" : resolvedVariantId;
-  const variantClasses = normalizedVariantId ? [normalizedVariantId, `button-${normalizedVariantId}`] : [];
-  const sizeClass = `btn-${size}`;
-  const combinedClassName = [...variantClasses, sizeClass, className].filter(Boolean).join(" ");
+  const resolvedVariantId = parseThemeButtonVariantId(variantId);
+  const combinedClassName = resolvedVariantId ? themeButtonClassName({
+    variant: resolvedVariantId,
+    size,
+    extraClassName: className
+  }) : className;
   if (resolvedHref) {
     return /* @__PURE__ */ jsx15(
       "a",
@@ -27127,7 +27222,7 @@ function FileDownloadNode({
       {
         href,
         download: filename,
-        className: themedButtonClass({
+        className: themeButtonClassName({
           variant,
           size: "md",
           extraClassName: "rb-inline-flex rb-shrink-0 rb-items-center rb-justify-center rb-gap-2"
@@ -28819,7 +28914,7 @@ var EventSpotlight = ({
   }
   const containerClass = getContainerClass(layout, columns);
   const cardOrientation = getCardOrientation(layout);
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   return /* @__PURE__ */ jsxs19("div", { className: `event-spotlight-section ${className || ""}`, "data-block": "event-spotlight", children: [
     /* @__PURE__ */ jsx32("div", { className: `event-spotlight ${containerClass}`, children: normalizedEvents.map((event) => /* @__PURE__ */ jsx32(
       EventCard,
@@ -29312,7 +29407,16 @@ function CheckoutShellView(props2) {
 import { Fragment as Fragment5, jsx as jsx36, jsxs as jsxs22 } from "react/jsx-runtime";
 function renderServerPendingAction(label, soldOut) {
   return /* @__PURE__ */ jsxs22(Fragment5, { children: [
-    /* @__PURE__ */ jsx36("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: soldOut ? "Sold out" : label }),
+    /* @__PURE__ */ jsx36(
+      "button",
+      {
+        type: "button",
+        className: themeButtonClassName({ variant: "default", size: "md" }),
+        disabled: true,
+        "aria-disabled": "true",
+        children: soldOut ? "Sold out" : label
+      }
+    ),
     !soldOut ? /* @__PURE__ */ jsx36("p", { className: "rb-caption status-muted", children: "Cart actions become interactive after page load." }) : null
   ] });
 }
@@ -29332,7 +29436,14 @@ function ProductListServerContent(props2) {
       ),
       actions: /* @__PURE__ */ jsxs22(Fragment5, { children: [
         renderServerPendingAction(card.actionLabel, card.soldOut),
-        card.path ? /* @__PURE__ */ jsx36("a", { href: card.path, className: "secondary btn-sm", children: "View details" }) : null
+        card.path ? /* @__PURE__ */ jsx36(
+          "a",
+          {
+            href: card.path,
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
+            children: "View details"
+          }
+        ) : null
       ] })
     },
     card.productId
@@ -29865,7 +29976,7 @@ function renderCalendarGrid(display) {
         "button",
         {
           type: "button",
-          className: themedButtonClass({
+          className: themeButtonClassName({
             variant: display.buttonVariant,
             size: "sm"
           }),
@@ -29951,7 +30062,7 @@ function renderTimetableSsr(display) {
         "button",
         {
           type: "button",
-          className: themedButtonClass({
+          className: themeButtonClassName({
             variant: display.buttonVariant,
             size: "sm"
           }),
@@ -30308,7 +30419,7 @@ var FormNodeSSR = ({
             "button",
             {
               type: "submit",
-              className: themedButtonClass({
+              className: themeButtonClassName({
                 variant: "primary",
                 size: "md",
                 extraClassName: "rb-w-full rb-sm-w-auto"
@@ -30399,7 +30510,7 @@ function NewsletterFormSSR({
               "button",
               {
                 type: "submit",
-                className: themedButtonClass({ variant: "primary", size: "md" }),
+                className: themeButtonClassName({ variant: "primary", size: "md" }),
                 children: display.buttonLabel
               }
             ) })
@@ -30519,7 +30630,16 @@ function ShopSSR({
               PassCardView,
               {
                 display: pass,
-                action: /* @__PURE__ */ jsx49("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: pass.actionLabel })
+                action: /* @__PURE__ */ jsx49(
+                  "button",
+                  {
+                    type: "button",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
+                    disabled: true,
+                    "aria-disabled": "true",
+                    children: pass.actionLabel
+                  }
+                )
               },
               pass.id
             )),
@@ -30527,7 +30647,16 @@ function ShopSSR({
               MembershipCardView,
               {
                 display: membership,
-                action: /* @__PURE__ */ jsx49("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: membership.actionLabel })
+                action: /* @__PURE__ */ jsx49(
+                  "button",
+                  {
+                    type: "button",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
+                    disabled: true,
+                    "aria-disabled": "true",
+                    children: membership.actionLabel
+                  }
+                )
               },
               membership.id
             ))

package/dist/server/index.mjs

@@ -6229,7 +6229,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.60.9";
+var SDK_VERSION = "0.60.11";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {