@juo/blocks 1.16.0 → 2.0.0-alpha.2

package/dist/core.js

@@ -1,11 +1,13 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { f as createContext, g as d, h as w, j as registerBlock, E, u, k as getDefinedBlocks, l as createBlockInstance, m as defineBlock, s as subscribeContext, G as GRID_V1_ENGINE_ID, n as clampRect, p as applyFillExpansion, q as compactItems, t as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-ClH0MEYr.js";
-import { B, v, x, y, z, L, P, S, c, T, A, d as d2, b, F, H, I, J, K, N, O, Q, R, U, V, W, X, Y, Z, i, _, a, $, a0, o, a1, a2, a3, e, a4, r, a5, a6, a7, w as w2 } from "./css-runtime-ClH0MEYr.js";
+import { e as createContext, f as d, m as w, n as defineBlock, h as createBlockInstance, j as getDefinedBlocks, p as registerBlock, E, u, s as subscribeContext } from "./block-BjJztStr.js";
+import { B, q, t, S, v, _, x, c, y, g, z, A, D, F, G, i, H, b, I, o, J, k, K, l, L, w as w2 } from "./block-BjJztStr.js";
+import { G as GRID_V1_ENGINE_ID, d as clampRect, e as applyFillExpansion, f as compactItems, g as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-B7tZrBIp.js";
+import { h, i as i2, L as L2, P, a, T, b as b2, j, k as k2, l as l2, m, n, o as o2, p, q as q2, s, t as t2, u as u2, v as v2, c as c2, w as w3, r } from "./css-runtime-B7tZrBIp.js";
 import { reportBlockWarning, reportBlockError } from "./observability.js";
-import { a as createEditorBridge, D as createSelectBlockMessage } from "./bridge-xiKEzCGR.js";
-import { p } from "./project-gridstack-CM783oKI.js";
+import { a as createEditorBridge, E as createSelectBlockMessage } from "./bridge-Mz0CqG6E.js";
+import { p as p2 } from "./project-gridstack-PxN_DIfP.js";
 import { clearLayoutModeAdapter, getLayoutModeAdapter, registerLayoutModeAdapter } from "./layout-mode-adapter-BBd4JRQd.js";
 function createState() {
   const discountCode = d(null);
@@ -75,6 +77,111 @@ function createState() {
   };
 }
 const StateContext = createContext("state");
+const OVERLAY_WRAPPER_SCHEMA = {
+  type: "object",
+  properties: {
+    props: {
+      type: "object",
+      properties: {
+        layout: {
+          type: "string",
+          enum: ["modal", "sidebar"]
+        },
+        canAbort: {
+          type: "boolean"
+        }
+      },
+      required: ["layout"],
+      additionalProperties: false
+    },
+    slots: {
+      type: "object",
+      properties: {
+        content: {}
+      },
+      additionalProperties: false
+    }
+  },
+  required: ["props", "slots"],
+  additionalProperties: false
+};
+function defineOverlayWrapper(opts) {
+  const layout = opts.layout ?? "sidebar";
+  const canAbort = opts.canAbort ?? true;
+  return defineBlock(opts.name, {
+    displayName: opts.title,
+    group: "internal",
+    schema: OVERLAY_WRAPPER_SCHEMA,
+    initialValue: () => ({
+      props: { layout, canAbort },
+      slots: {
+        content: [createBlockInstance(opts.content)]
+      }
+    }),
+    renderer: () => null
+  });
+}
+const OVERLAY_PREFIX$1 = "overlay:";
+function callInitialValue(block) {
+  if (typeof block.initialValue !== "function") return block.initialValue;
+  try {
+    return block.initialValue();
+  } catch (error) {
+    console.warn(
+      `[overlays] initialValue() threw for "${block.name}"; its content block will not be hidden from the palette.`,
+      error
+    );
+    return void 0;
+  }
+}
+function buildOverlayRegistry(blocks) {
+  var _a, _b;
+  const registry = {};
+  for (const block of blocks) {
+    if (!block.name.startsWith(OVERLAY_PREFIX$1)) continue;
+    const id = block.name.slice(OVERLAY_PREFIX$1.length);
+    const initial = callInitialValue(block);
+    const first = (_b = (_a = initial == null ? void 0 : initial.slots) == null ? void 0 : _a.content) == null ? void 0 : _b[0];
+    const contentBlock = typeof (first == null ? void 0 : first.type) === "string" ? first.type : "";
+    registry[id] = {
+      block: block.name,
+      title: block.displayName ?? id,
+      contentBlock
+    };
+  }
+  return registry;
+}
+const OVERLAY_PREFIX = "overlay:";
+const OverlayServiceContext = createContext("services/overlay");
+function createOverlayService(themeState, options = {}) {
+  const getBlocks = options.getBlocks ?? getDefinedBlocks;
+  const current = w(() => {
+    const root = themeState.overlay.blocks.value[0];
+    const type = root == null ? void 0 : root.type;
+    if (typeof type !== "string" || !type.startsWith(OVERLAY_PREFIX)) {
+      return null;
+    }
+    const props = root.props ?? {};
+    return {
+      name: type,
+      // Defaults mirror defineOverlayWrapper's seeding in overlay-wrapper.ts — keep in sync.
+      layout: props.layout ?? "sidebar",
+      canAbort: Boolean(props.canAbort ?? true)
+    };
+  });
+  return {
+    getEditableOverlays() {
+      return buildOverlayRegistry(getBlocks());
+    },
+    open(name, params) {
+      void themeState.resolve("overlay", name, params);
+    },
+    close() {
+      themeState.overlay.blocks.value = [];
+    },
+    current
+  };
+}
 function isLocalhostOrigin(origin) {
   try {
     const url = new URL(origin);
@@ -190,8 +297,8 @@ function createApiCustomerAdapter(fetcher) {
           _tag: "Success",
           data: { id: data.id, name, email: data.email }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
@@ -209,7 +316,7 @@ const PARAMS = {
 function uuid() {
   return ("10000000-1000-4000-8000" + -1e11).replace(
     /[018]/g,
-    (c2) => (c2 ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c2 / 4).toString(16)
+    (c3) => (c3 ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c3 / 4).toString(16)
   );
 }
 function createMockLoginAdapter(opts = {}) {
@@ -280,8 +387,8 @@ function createApiLoginAdapter(fetcher, opts) {
           lang
         );
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async authenticate(params) {
@@ -315,8 +422,8 @@ function createApiLoginAdapter(fetcher, opts) {
           throw new Error(`Unexpected response: ${res.statusText}`);
         }
         return { _tag: "Success", data: await res.json() };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     getAuthorizeUrl({ connection, state, shop }) {
@@ -575,7 +682,7 @@ function createLoginService(init) {
   return service;
 }
 const LoginServiceContext = createContext("services/login");
-function createMockOrdersAdapter() {
+function createMockOrderAdapter() {
   const mockOrders = [
     {
       id: "10001",
@@ -659,7 +766,7 @@ function mapOrder(order) {
     customAttributes: order.customAttributes
   };
 }
-function createApiOrdersAdapter(fetcher) {
+function createApiOrderAdapter(fetcher) {
   return {
     async getOrders(params) {
       const query = new URLSearchParams();
@@ -685,7 +792,7 @@ function createApiOrdersAdapter(fetcher) {
     }
   };
 }
-function createOrdersService(adapter) {
+function createOrderService(adapter) {
   return {
     async getOrders(params) {
       try {
@@ -697,7 +804,7 @@ function createOrdersService(adapter) {
     }
   };
 }
-const OrdersServiceContext = createContext("services/orders");
+const OrderServiceContext = createContext("services/order");
 function createMockProductAdapter() {
   const products = [
     {
@@ -888,9 +995,9 @@ function createMockProductAdapter() {
       await new Promise((resolve) => setTimeout(resolve, 100));
       return products.filter((product) => ids.includes(product.id)).map(toAvailableProduct);
     },
-    async getAvailableProducts({ q }) {
+    async getAvailableProducts({ q: q3 }) {
       await new Promise((resolve) => setTimeout(resolve, 100));
-      const queryLower = q == null ? void 0 : q.toLowerCase();
+      const queryLower = q3 == null ? void 0 : q3.toLowerCase();
       return products.filter(
         (product) => !queryLower || product.title.toLowerCase().includes(queryLower) || product.variants.some(
           (variant) => variant.title.toLowerCase().includes(queryLower)
@@ -964,7 +1071,7 @@ function mapProduct(product, currencyCode) {
     featuredImage: product.image == null ? null : { url: product.image.url, altText: product.image.altText ?? void 0 },
     hasOnlyDefaultVariant: product.variants.length <= 1,
     variants: {
-      items: product.variants.map((v2) => mapVariant(v2, currencyCode)),
+      items: product.variants.map((v3) => mapVariant(v3, currencyCode)),
       pageInfo: {
         hasNextPage: false,
         hasPrevPage: false,
@@ -1019,7 +1126,7 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
         }
         const body = await fetchProducts(params);
         return {
-          items: body.data.map((p2) => mapProduct(p2, currencyCode)),
+          items: body.data.map((p3) => mapProduct(p3, currencyCode)),
           pageInfo: {
             hasNextPage: body.hasNextPage,
             hasPrevPage: body.hasPrevPage,
@@ -1045,10 +1152,10 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       const res = await fetcher(`/customer/products/by-ids?${params.toString()}`);
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => ({
-        id: p2.id,
-        title: p2.title ?? "",
-        featuredImage: p2.featuredImage ? { url: p2.featuredImage.url, altText: p2.featuredImage.altText } : null,
+      return (data ?? []).map((p3) => ({
+        id: p3.id,
+        title: p3.title ?? "",
+        featuredImage: p3.featuredImage ? { url: p3.featuredImage.url, altText: p3.featuredImage.altText } : null,
         hasOnlyDefaultVariant: true,
         collections: []
       }));
@@ -1060,30 +1167,30 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       const res = await fetcher(`/customer/products/variants?${params.toString()}`);
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => {
+      return (data ?? []).map((p3) => {
         var _a;
         return {
-          id: p2.id,
-          title: p2.title,
-          description: p2.description ?? "",
-          featuredImage: p2.featuredImage,
-          hasOnlyDefaultVariant: p2.hasOnlyDefaultVariant ?? (((_a = p2.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
-          variants: (p2.variants ?? []).map((v2) => ({
-            id: v2.id,
-            availableForSale: v2.availableForSale,
-            title: v2.title,
-            currentPrice: v2.currentPrice,
-            basePrice: v2.basePrice,
-            image: v2.image,
-            recurring: v2.recurring
+          id: p3.id,
+          title: p3.title,
+          description: p3.description ?? "",
+          featuredImage: p3.featuredImage,
+          hasOnlyDefaultVariant: p3.hasOnlyDefaultVariant ?? (((_a = p3.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
+          variants: (p3.variants ?? []).map((v3) => ({
+            id: v3.id,
+            availableForSale: v3.availableForSale,
+            title: v3.title,
+            currentPrice: v3.currentPrice,
+            basePrice: v3.basePrice,
+            image: v3.image,
+            recurring: v3.recurring
           }))
         };
       });
     },
-    async getAvailableProducts({ subscriptionId, lineId, q, mode, action, pagination }) {
+    async getAvailableProducts({ subscriptionId, lineId, q: q3, mode, action, pagination }) {
       const params = new URLSearchParams();
       params.set("action", action);
-      if (q) params.set("q", q);
+      if (q3) params.set("q", q3);
       if (mode) params.set("mode", mode);
       if (pagination && "after" in pagination) params.set("after", pagination.after);
       if (pagination && "before" in pagination) params.set("before", pagination.before);
@@ -1092,22 +1199,22 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       );
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => {
+      return (data ?? []).map((p3) => {
         var _a;
         return {
-          id: p2.id,
-          title: p2.title,
-          description: p2.description ?? "",
-          featuredImage: p2.featuredImage,
-          hasOnlyDefaultVariant: p2.hasOnlyDefaultVariant ?? (((_a = p2.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
-          variants: (p2.variants ?? []).map((v2) => ({
-            id: v2.id,
-            availableForSale: v2.availableForSale,
-            title: v2.title,
-            currentPrice: v2.currentPrice,
-            basePrice: v2.basePrice,
-            image: v2.image,
-            recurring: v2.recurring
+          id: p3.id,
+          title: p3.title,
+          description: p3.description ?? "",
+          featuredImage: p3.featuredImage,
+          hasOnlyDefaultVariant: p3.hasOnlyDefaultVariant ?? (((_a = p3.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
+          variants: (p3.variants ?? []).map((v3) => ({
+            id: v3.id,
+            availableForSale: v3.availableForSale,
+            title: v3.title,
+            currentPrice: v3.currentPrice,
+            basePrice: v3.basePrice,
+            image: v3.image,
+            recurring: v3.recurring
           }))
         };
       });
@@ -1152,7 +1259,7 @@ function routeNameTableFromPages(pages) {
 function createRouterService(options) {
   const { pages, pushImplementation } = options;
   const routeNameToPagePath = routeNameTableFromPages(pages);
-  const pathSet = new Set(pages.map((p2) => p2.path));
+  const pathSet = new Set(pages.map((p3) => p3.path));
   const navigationSubscribers = [];
   function notifySubscribers(logicalPath) {
     for (const cb of navigationSubscribers) cb({ path: logicalPath });
@@ -1420,7 +1527,7 @@ function createMockSubscriptionAdapter(options = {}) {
         data: subscription ? {
           ...subscription,
           items: subscription.items.map((item) => ({ ...item })),
-          discounts: subscription.discounts.map((d3) => ({ ...d3 }))
+          discounts: subscription.discounts.map((d2) => ({ ...d2 }))
         } : null
       };
     },
@@ -1468,7 +1575,7 @@ function createMockSubscriptionAdapter(options = {}) {
       }
       const currencyCode = ((_a = subscription.items[0]) == null ? void 0 : _a.price.currencyCode) ?? "USD";
       const product = await ((_b = options.productAdapter) == null ? void 0 : _b.getByVariantId(item.variantId)) ?? await ((_c = options.productAdapter) == null ? void 0 : _c.getById(item.variantId)) ?? null;
-      const variant = (product == null ? void 0 : product.variants.items.find((v2) => v2.id === item.variantId)) ?? (product == null ? void 0 : product.variants.items[0]);
+      const variant = (product == null ? void 0 : product.variants.items.find((v3) => v3.id === item.variantId)) ?? (product == null ? void 0 : product.variants.items[0]);
       const linePrice = ((_e = (_d = variant == null ? void 0 : variant.purchaseOptions) == null ? void 0 : _d[0]) == null ? void 0 : _e.price) ?? (variant == null ? void 0 : variant.price);
       subscription.items.push({
         id: `item_${Date.now()}_${subscription.items.length}`,
@@ -1481,8 +1588,10 @@ function createMockSubscriptionAdapter(options = {}) {
         ...variant && product && !product.hasOnlyDefaultVariant ? { variantTitle: variant.title } : {},
         ...(variant == null ? void 0 : variant.image) ? { variantImage: variant.image } : {},
         variantAvailableForSale: true,
-        billingPolicy: ((_f = subscription.items[0]) == null ? void 0 : _f.billingPolicy) ?? subscription.billingPolicy ?? null,
-        deliveryPolicy: ((_g = subscription.items[0]) == null ? void 0 : _g.deliveryPolicy) ?? subscription.deliveryPolicy ?? null
+        // An explicit per-line billingPolicy wins; otherwise inherit the plan's.
+        billingPolicy: item.billingPolicy ?? ((_f = subscription.items[0]) == null ? void 0 : _f.billingPolicy) ?? subscription.billingPolicy ?? null,
+        deliveryPolicy: ((_g = subscription.items[0]) == null ? void 0 : _g.deliveryPolicy) ?? subscription.deliveryPolicy ?? null,
+        ...item.recurringCycleLimit != null ? { recurringCycleLimit: item.recurringCycleLimit } : {}
       });
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: void 0 };
@@ -1493,7 +1602,7 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      subscription.items = subscription.items.filter((i2) => i2.id !== itemId);
+      subscription.items = subscription.items.filter((i3) => i3.id !== itemId);
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: void 0 };
     },
@@ -1503,7 +1612,7 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      const item = subscription.items.find((i2) => i2.id === lineId);
+      const item = subscription.items.find((i3) => i3.id === lineId);
       if (!item) {
         return { _tag: "Failure", error: "Line item not found" };
       }
@@ -1519,7 +1628,7 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      const item = subscription.items.find((i2) => i2.id === lineId);
+      const item = subscription.items.find((i3) => i3.id === lineId);
       if (!item) {
         return { _tag: "Failure", error: "Line item not found" };
       }
@@ -1709,7 +1818,7 @@ function createMockSubscriptionAdapter(options = {}) {
         data: {
           ...subscription,
           items: subscription.items.map((item) => ({ ...item })),
-          discounts: subscription.discounts.map((d3) => ({ ...d3 }))
+          discounts: subscription.discounts.map((d2) => ({ ...d2 }))
         }
       };
     },
@@ -1781,14 +1890,14 @@ function mapSubscription(raw) {
     ),
     discounts: (raw.discounts ?? []).map(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (d3) => {
+      (d2) => {
         var _a2, _b2, _c;
         return {
-          id: d3.id,
-          type: ((_a2 = d3.value) == null ? void 0 : _a2.type) === "fixed-amount" || d3.type === "fixed_amount" ? "fixed_amount" : "percentage",
-          value: ((_b2 = d3.value) == null ? void 0 : _b2.amount) ?? ((_c = d3.value) == null ? void 0 : _c.percentage) ?? d3.value ?? 0,
-          code: d3.title ?? d3.code ?? "",
-          description: d3.description ?? ""
+          id: d2.id,
+          type: ((_a2 = d2.value) == null ? void 0 : _a2.type) === "fixed-amount" || d2.type === "fixed_amount" ? "fixed_amount" : "percentage",
+          value: ((_b2 = d2.value) == null ? void 0 : _b2.amount) ?? ((_c = d2.value) == null ? void 0 : _c.percentage) ?? d2.value ?? 0,
+          code: d2.title ?? d2.code ?? "",
+          description: d2.description ?? ""
         };
       }
     ),
@@ -1822,8 +1931,8 @@ function createApiSubscriptionAdapter(fetcher) {
       try {
         const params = new URLSearchParams();
         if ((_a = options == null ? void 0 : options.filters) == null ? void 0 : _a.length) {
-          const groups = options.filters.filter((f) => Object.keys(f).length > 0).map((f) => Object.entries(f).filter(([, v2]) => Boolean(v2))).filter((entries) => entries.length > 0).map(
-            (entries) => "(" + entries.map(([k, v2]) => `${k}:'${v2}'`).join(" AND ") + ")"
+          const groups = options.filters.filter((f) => Object.keys(f).length > 0).map((f) => Object.entries(f).filter(([, v3]) => Boolean(v3))).filter((entries) => entries.length > 0).map(
+            (entries) => "(" + entries.map(([k3, v3]) => `${k3}:'${v3}'`).join(" AND ") + ")"
           );
           if (groups.length) params.set("query", groups.join(" OR "));
         }
@@ -1853,8 +1962,8 @@ function createApiSubscriptionAdapter(fetcher) {
             }
           }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async getById(id) {
@@ -1866,24 +1975,41 @@ function createApiSubscriptionAdapter(fetcher) {
         const body = await res.json();
         const raw = body.data[0];
         return { _tag: "Success", data: raw ? mapSubscription(raw) : null };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
+    // Uses the legacy POST /customer/subscriptions/{id}/lines rather than
+    // POST /customer/v1/subscriptions/{id}/items: only the legacy endpoint
+    // accepts a per-line `billingPolicy`. It answers 204 with no body.
+    // Behavioural differences vs the v1 route, both intentional here:
+    //   - it rejects membership subscriptions with 403 (v1 does not),
+    //   - it skips the availableForSale check (v1 enforces it), so callers are
+    //     responsible for only offering purchasable variants — which the
+    //     product picker already does.
     async addItem({ subscriptionId, item }) {
       try {
+        const body = {
+          productVariantId: item.variantId,
+          quantity: item.quantity,
+          // `!= null` on purpose: null means "inherit"/"no limit", and the
+          // endpoint rejects an explicit null on either field.
+          ...item.billingPolicy != null ? { billingPolicy: item.billingPolicy } : {},
+          ...item.recurringCycleLimit != null ? { renewalLimit: item.recurringCycleLimit } : {},
+          ...item.shippingMethodHandle != null ? { shippingMethodHandle: item.shippingMethodHandle } : {}
+        };
         const res = await fetcher(
-          `/customer/v1/subscriptions/${subscriptionId}/items`,
+          `/customer/subscriptions/${subscriptionId}/lines`,
           {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ variant: item.variantId, quantity: item.quantity })
+            body: JSON.stringify(body)
           }
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async removeItem({ subscriptionId, itemId }) {
@@ -1894,8 +2020,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateItem({ subscriptionId, lineId, update }) {
@@ -1916,8 +2042,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateItemAttributes({ subscriptionId, lineId, customAttributes }) {
@@ -1932,8 +2058,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateAttributes({ subscriptionId, customAttributes }) {
@@ -1948,8 +2074,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async skipLineItem({ subscriptionId, lineId, nextBillingDate }) {
@@ -1964,8 +2090,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateBoxItems({ subscriptionId, parentId, items, shippingMethodHandle }) {
@@ -1980,8 +2106,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async addDiscount({ subscriptionId, code }) {
@@ -2007,10 +2133,10 @@ function createApiSubscriptionAdapter(fetcher) {
           return { _tag: "Failure", error: { kind: "UNKNOWN", message: `HTTP ${res.status}` } };
         }
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
+      } catch (e) {
         return {
           _tag: "Failure",
-          error: { kind: "NETWORK", message: e2 instanceof Error ? e2.message : void 0 }
+          error: { kind: "NETWORK", message: e instanceof Error ? e.message : void 0 }
         };
       }
     },
@@ -2032,10 +2158,10 @@ function createApiSubscriptionAdapter(fetcher) {
           return { _tag: "Failure", error: { kind: "UNKNOWN", message: `HTTP ${res.status}` } };
         }
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
+      } catch (e) {
         return {
           _tag: "Failure",
-          error: { kind: "NETWORK", message: e2 instanceof Error ? e2.message : void 0 }
+          error: { kind: "NETWORK", message: e instanceof Error ? e.message : void 0 }
         };
       }
     },
@@ -2053,8 +2179,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // PATCH /customer/v1/subscriptions/{id} with the full customer-visible set.
@@ -2071,8 +2197,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async resume({ subscriptionId }) {
@@ -2084,8 +2210,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async pause({ subscriptionId }) {
@@ -2097,8 +2223,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async reactivate({ subscriptionId }) {
@@ -2110,8 +2236,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async cancel({ subscriptionId, reason }) {
@@ -2127,8 +2253,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/plans exists yet.
@@ -2140,8 +2266,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1 equivalent exists yet.
@@ -2153,8 +2279,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: (data == null ? void 0 : data.id) ?? null };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells exists yet.
@@ -2165,24 +2291,24 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
-        const products = data.map((p2) => {
+        const products = data.map((p3) => {
           var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           return {
-            id: p2.id,
-            variantId: ((_b = (_a = p2.variants) == null ? void 0 : _a[0]) == null ? void 0 : _b.id) ?? "",
-            title: p2.title ?? "",
-            imageUrl: ((_c = p2.featuredImage) == null ? void 0 : _c.url) ?? void 0,
+            id: p3.id,
+            variantId: ((_b = (_a = p3.variants) == null ? void 0 : _a[0]) == null ? void 0 : _b.id) ?? "",
+            title: p3.title ?? "",
+            imageUrl: ((_c = p3.featuredImage) == null ? void 0 : _c.url) ?? void 0,
             price: {
-              amount: String(((_f = (_e = (_d = p2.variants) == null ? void 0 : _d[0]) == null ? void 0 : _e.currentPrice) == null ? void 0 : _f.amount) ?? 0),
-              currencyCode: ((_i = (_h = (_g = p2.variants) == null ? void 0 : _g[0]) == null ? void 0 : _h.currentPrice) == null ? void 0 : _i.currencyCode) ?? ""
+              amount: String(((_f = (_e = (_d = p3.variants) == null ? void 0 : _d[0]) == null ? void 0 : _e.currentPrice) == null ? void 0 : _f.amount) ?? 0),
+              currencyCode: ((_i = (_h = (_g = p3.variants) == null ? void 0 : _g[0]) == null ? void 0 : _h.currentPrice) == null ? void 0 : _i.currencyCode) ?? ""
             },
             // recurring comes from the upsell rule on variants[0]; present in PreparedProductSchema
-            recurring: (_k = (_j = p2.variants) == null ? void 0 : _j[0]) == null ? void 0 : _k.recurring
+            recurring: (_k = (_j = p3.variants) == null ? void 0 : _j[0]) == null ? void 0 : _k.recurring
           };
         });
         return { _tag: "Success", data: products };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells POST exists yet.
@@ -2202,8 +2328,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1 equivalent exists yet.
@@ -2219,8 +2345,8 @@ function createApiSubscriptionAdapter(fetcher) {
           _tag: "Success",
           data: { id: data.id, createdAt: data.createdAt }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoints, split by stage (see SubscriptionService.renewNow docs):
@@ -2240,8 +2366,8 @@ function createApiSubscriptionAdapter(fetcher) {
             result: (body == null ? void 0 : body.result) ?? "success"
           }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — POST /plan returns 204; re-fetch to return the updated subscription.
@@ -2263,8 +2389,8 @@ function createApiSubscriptionAdapter(fetcher) {
           _tag: "Failure",
           error: "Subscription not found after frequency change"
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
@@ -2325,13 +2451,13 @@ function mapScheduleOrder(order) {
       };
     }),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    discounts: (order.discounts ?? []).map((d3) => {
+    discounts: (order.discounts ?? []).map((d2) => {
       var _a, _b, _c;
       return {
-        id: d3.id,
-        title: d3.title ?? void 0,
-        type: ((_a = d3.value) == null ? void 0 : _a.type) === "fixed-amount" ? "fixed_amount" : "percentage",
-        value: ((_b = d3.value) == null ? void 0 : _b.amount) ?? ((_c = d3.value) == null ? void 0 : _c.percentage) ?? 0
+        id: d2.id,
+        title: d2.title ?? void 0,
+        type: ((_a = d2.value) == null ? void 0 : _a.type) === "fixed-amount" ? "fixed_amount" : "percentage",
+        value: ((_b = d2.value) == null ? void 0 : _b.amount) ?? ((_c = d2.value) == null ? void 0 : _c.percentage) ?? 0
       };
     })
   };
@@ -2370,26 +2496,26 @@ function buildSkipItemMatcher(params) {
 const DELIVERY_PRICE = 5;
 const DELIVERY_OFFSET_DAYS = 2;
 function toPrice(amount) {
-  const n = Number.parseFloat(amount ?? "0");
-  return Number.isFinite(n) ? n : 0;
+  const n2 = Number.parseFloat(amount ?? "0");
+  return Number.isFinite(n2) ? n2 : 0;
 }
 function addInterval(date, interval, units) {
-  const d3 = new Date(date);
+  const d2 = new Date(date);
   switch (interval) {
     case "DAY":
-      d3.setDate(d3.getDate() + units);
+      d2.setDate(d2.getDate() + units);
       break;
     case "WEEK":
-      d3.setDate(d3.getDate() + units * 7);
+      d2.setDate(d2.getDate() + units * 7);
       break;
     case "YEAR":
-      d3.setFullYear(d3.getFullYear() + units);
+      d2.setFullYear(d2.getFullYear() + units);
       break;
     default:
-      d3.setMonth(d3.getMonth() + units);
+      d2.setMonth(d2.getMonth() + units);
       break;
   }
-  return d3;
+  return d2;
 }
 function mapItem(sub, item, cycle) {
   var _a, _b;
@@ -2447,11 +2573,11 @@ function projectUpcomingOrders(sub, count) {
       deliveryDate: deliveryDate.toISOString(),
       status: "scheduled",
       items,
-      discounts: sub.discounts.map((d3) => ({
-        id: d3.id,
-        title: d3.code,
-        type: d3.type,
-        value: d3.value
+      discounts: sub.discounts.map((d2) => ({
+        id: d2.id,
+        title: d2.code,
+        type: d2.type,
+        value: d2.value
       }))
     });
   }
@@ -2479,7 +2605,7 @@ function applyAdjustments(orders, stored) {
         );
         const subtotal = items.reduce((sum, it) => sum + it.totalPrice, 0);
         next = { ...next, items, subtotal };
-        if (items.length > 0 && items.every((i2) => i2.skipped)) {
+        if (items.length > 0 && items.every((i3) => i3.skipped)) {
           next = { ...next, skipped: true, status: "skipped", deliveryPrice: 0 };
         }
       }
@@ -2514,11 +2640,11 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
       const iso = toIsoOrNull(opts.date);
       const target = iso == null ? void 0 : iso.split("T")[0];
       const match = target ? orders.find(
-        (o2) => o2.deliveryDate.split("T")[0] === target || o2.date.split("T")[0] === target
+        (o3) => o3.deliveryDate.split("T")[0] === target || o3.date.split("T")[0] === target
       ) : void 0;
       return match ? match.cycleIndex : null;
     }
-    const firstScheduled = orders.find((o2) => o2.status === "scheduled");
+    const firstScheduled = orders.find((o3) => o3.status === "scheduled");
     return (firstScheduled == null ? void 0 : firstScheduled.cycleIndex) ?? null;
   }
   async function recordAdjustment(subscriptionId, opts, buildAction, matcherOverride) {
@@ -2551,25 +2677,25 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
       const subs = await subscriptionsToProject(subscriptionId);
       const skipCount = new Set(
         stored.filter(
-          (s) => s.adjustment.action.type === "SKIP_ORDER" || s.adjustment.action.type === "SKIP_ITEM"
-        ).map((s) => `${s.subscriptionId}:${s.cycle}`)
+          (s2) => s2.adjustment.action.type === "SKIP_ORDER" || s2.adjustment.action.type === "SKIP_ITEM"
+        ).map((s2) => `${s2.subscriptionId}:${s2.cycle}`)
       ).size;
       const depth = excludeSkipped ? count + skipCount : count;
       const orders = subs.flatMap(
         (sub) => applyAdjustments(projectUpcomingOrders(sub, depth), stored)
-      ).filter((o2) => excludeSkipped ? !o2.skipped : true).map(
-        (o2) => (
+      ).filter((o3) => excludeSkipped ? !o3.skipped : true).map(
+        (o3) => (
           // Mirror backend removeSkippedItems: the billable view also strips
           // skipped lines from surviving (partially-skipped) orders. No
           // recompute needed — skipped lines already carry totalPrice 0 (R4).
-          excludeSkipped && o2.items.some((i2) => i2.skipped) ? { ...o2, items: o2.items.filter((i2) => !i2.skipped) } : o2
+          excludeSkipped && o3.items.some((i3) => i3.skipped) ? { ...o3, items: o3.items.filter((i3) => !i3.skipped) } : o3
         )
-      ).sort((a8, b2) => a8.date.localeCompare(b2.date));
+      ).sort((a2, b3) => a2.date.localeCompare(b3.date));
       return { _tag: "Success", data: orders.slice(0, count) };
     },
     async getAdjustments() {
       await new Promise((r2) => setTimeout(r2, 200));
-      return { _tag: "Success", data: stored.map((s) => s.adjustment) };
+      return { _tag: "Success", data: stored.map((s2) => s2.adjustment) };
     },
     async skipOrder({ subscriptionId, cycle, date }) {
       await new Promise((r2) => setTimeout(r2, 300));
@@ -2642,7 +2768,7 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
     },
     async removeAdjustment({ adjustmentId }) {
       await new Promise((r2) => setTimeout(r2, 200));
-      stored = stored.filter((s) => s.adjustment.id !== adjustmentId);
+      stored = stored.filter((s2) => s2.adjustment.id !== adjustmentId);
       return { _tag: "Success", data: void 0 };
     }
   };
@@ -2657,8 +2783,8 @@ function createApiSchedulesAdapter(fetcher) {
       });
       if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
       return { _tag: "Success", data: void 0 };
-    } catch (e2) {
-      return { _tag: "Failure", error: e2 };
+    } catch (e) {
+      return { _tag: "Failure", error: e };
     }
   }
   return {
@@ -2671,8 +2797,8 @@ function createApiSchedulesAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: (data.orders ?? []).map(mapScheduleOrder) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async getAdjustments() {
@@ -2688,10 +2814,10 @@ function createApiSchedulesAdapter(fetcher) {
           if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
           const body = await res.json();
           all.push(
-            ...body.data.map((a8) => ({
-              id: a8.id,
-              matcher: a8.matcher,
-              action: a8.action
+            ...body.data.map((a2) => ({
+              id: a2.id,
+              matcher: a2.matcher,
+              action: a2.action
             }))
           );
           if (!body.hasNextPage) return { _tag: "Success", data: all };
@@ -2707,8 +2833,8 @@ function createApiSchedulesAdapter(fetcher) {
           _tag: "Failure",
           error: "Adjustments pagination exceeded 50 pages"
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async skipOrder({ cycle, date }) {
@@ -2784,16 +2910,16 @@ function createApiSchedulesAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
 }
 const SchedulesServiceContext = createContext("services/schedules");
-function isSameCalendarDay(a8, b2) {
-  const da = new Date(a8);
-  const db = new Date(b2);
+function isSameCalendarDay(a2, b3) {
+  const da = new Date(a2);
+  const db = new Date(b3);
   if (Number.isNaN(da.getTime()) || Number.isNaN(db.getTime())) return false;
   return da.toISOString().slice(0, 10) === db.toISOString().slice(0, 10);
 }
@@ -2873,26 +2999,26 @@ function createSchedulesService(adapter, opts) {
       const adjustments = await adapter.getAdjustments();
       if (adjustments._tag === "Failure") return adjustments;
       const covering = adjustments.data.filter(
-        (a8) => a8.action.type === "SKIP_ITEM" && a8.action.input.lineIds.includes(lineId) && matcherAffects(a8.matcher, { cycle, date })
+        (a2) => a2.action.type === "SKIP_ITEM" && a2.action.input.lineIds.includes(lineId) && matcherAffects(a2.matcher, { cycle, date })
       );
       if (covering.length === 0) {
         return { _tag: "Failure", error: "No skip found for this item" };
       }
-      if (covering.some((a8) => a8.action.input.lineIds.length > 1)) {
+      if (covering.some((a2) => a2.action.input.lineIds.length > 1)) {
         return {
           _tag: "Failure",
           error: "This item was skipped together with other items and can't be unskipped individually"
         };
       }
-      if (covering.some((a8) => !matcherExactlyTargets(a8.matcher, { cycle, date }))) {
+      if (covering.some((a2) => !matcherExactlyTargets(a2.matcher, { cycle, date }))) {
         return {
           _tag: "Failure",
           error: "This skip also affects another order and can't be removed from here"
         };
       }
       let deleted = 0;
-      for (const a8 of covering) {
-        const result = await adapter.removeAdjustment({ adjustmentId: a8.id });
+      for (const a2 of covering) {
+        const result = await adapter.removeAdjustment({ adjustmentId: a2.id });
         if (result._tag === "Failure") {
           if (deleted > 0) await notifyChanged(subscriptionId);
           return result;
@@ -3127,7 +3253,7 @@ function createSubscriptionService(adapter) {
 function getDefaultBlockForAction(actionType, actionConfig, blockId) {
   const blockName = `action:${actionType}`;
   const definedBlocks = getDefinedBlocks();
-  const exists = definedBlocks.some((b2) => b2.name === blockName);
+  const exists = definedBlocks.some((b3) => b3.name === blockName);
   if (!exists) {
     throw new Error(
       `No default block registered for action type "${actionType}". Expected a block named "${blockName}" to be registered in blocks-extensions.`
@@ -3137,7 +3263,7 @@ function getDefaultBlockForAction(actionType, actionConfig, blockId) {
 }
 function hasDefaultBlockForAction(actionType) {
   const blockName = `action:${actionType}`;
-  return getDefinedBlocks().some((b2) => b2.name === blockName);
+  return getDefinedBlocks().some((b3) => b3.name === blockName);
 }
 const WorkflowServiceContext = createContext("services/workflow");
 const RUN_SCOPED_RESET = {
@@ -3275,7 +3401,7 @@ function createWorkflowService(deps) {
         outcome: null
       });
       if (editor.isEditorMode) {
-        const displayStepId = isInitialResponse && previewStepId && ((_e = data.interactiveSteps) == null ? void 0 : _e.some((s) => s.stepId === previewStepId)) ? previewStepId : currentStepId;
+        const displayStepId = isInitialResponse && previewStepId && ((_e = data.interactiveSteps) == null ? void 0 : _e.some((s2) => s2.stepId === previewStepId)) ? previewStepId : currentStepId;
         const overlayBlocks = deps.themeState.overlay.blocks.value;
         const rootBlock = overlayBlocks[0];
         const stepSlot = displayStepId ? (_f = rootBlock == null ? void 0 : rootBlock.slots) == null ? void 0 : _f[displayStepId] : null;
@@ -3370,7 +3496,7 @@ function createWorkflowService(deps) {
     const presets = {};
     const baseLabelFor = (step) => {
       var _a;
-      return ((_a = getDefinedBlocks().find((b2) => b2.name === `action:${step.actionType}`)) == null ? void 0 : _a.displayName) ?? step.stepId;
+      return ((_a = getDefinedBlocks().find((b3) => b3.name === `action:${step.actionType}`)) == null ? void 0 : _a.displayName) ?? step.stepId;
     };
     const totalCounts = /* @__PURE__ */ new Map();
     for (const step of allSteps) {
@@ -3965,9 +4091,9 @@ const gridV1Engine = {
       case "resize": {
         const current = layout.items[cmd.blockId];
         if (current) {
-          const w3 = Math.max(1, Math.min(cmd.size.w, ctx2.cols - current.c));
-          const h = Math.max(1, cmd.size.h);
-          layout.items[cmd.blockId] = { ...current, w: w3, h };
+          const w4 = Math.max(1, Math.min(cmd.size.w, ctx2.cols - current.c));
+          const h2 = Math.max(1, cmd.size.h);
+          layout.items[cmd.blockId] = { ...current, w: w4, h: h2 };
         }
         break;
       }
@@ -4034,7 +4160,7 @@ function insertRectRelative(doc, args) {
     if (!layout) continue;
     const target = layout.items[args.targetId];
     if (!target) continue;
-    const cols = ((_a = doc.breakpoints.find((b2) => b2.id === breakpointId)) == null ? void 0 : _a.cols) ?? ((_b = layout.grid) == null ? void 0 : _b.cols) ?? DEFAULT_GRID.cols;
+    const cols = ((_a = doc.breakpoints.find((b3) => b3.id === breakpointId)) == null ? void 0 : _a.cols) ?? ((_b = layout.grid) == null ? void 0 : _b.cols) ?? DEFAULT_GRID.cols;
     const insertRow = args.position === "before" ? target.r : target.r + target.h;
     for (const [id, rect] of Object.entries(layout.items)) {
       if (id === args.blockId) continue;
@@ -4085,18 +4211,19 @@ export {
   AuthenticationError,
   AuthenticationErrorReason,
   B as BlockWrapperEvent,
-  v as ContextProvideEvent,
-  x as ContextRequestEvent,
+  q as ContextProvideEvent,
+  t as ContextRequestEvent,
   CustomerServiceContext,
-  y as DEFAULT_BREAKPOINTS,
-  z as DEFAULT_GLOBAL_STYLES,
+  h as DEFAULT_BREAKPOINTS,
+  i2 as DEFAULT_GLOBAL_STYLES,
   DEFAULT_GRID,
   DEFAULT_NEW_BLOCK_HEIGHT,
   DISCOUNT_REJECTION_REASONS,
   GRID_V1_ENGINE_ID,
-  L as LAYOUT_SCOPE_ATTR,
+  L2 as LAYOUT_SCOPE_ATTR,
   LoginServiceContext,
-  OrdersServiceContext,
+  OrderServiceContext,
+  OverlayServiceContext,
   P as PAGE_ROOT_SLOT,
   ProductServiceContext,
   RouterServiceContext,
@@ -4107,99 +4234,105 @@ export {
   u as Signal,
   StateContext,
   SubscriptionServiceContext,
-  c as ThemeStateContext,
+  a as ThemeStateContext,
   T as TranslationContext,
   WorkflowServiceContext,
-  A as attachEmptyTracking,
-  d2 as backfillInstanceDefaults,
-  b as buildGridLayout,
-  F as buildLayoutCss,
+  v as __recordDevtoolsInstance,
+  _ as __recordDevtoolsPropSetter,
+  x as attachEmptyTracking,
+  c as backfillInstanceDefaults,
+  b2 as buildGridLayout,
+  j as buildLayoutCss,
   canvasMode,
   clampRect,
-  H as classifyRowDividers,
+  k2 as classifyRowDividers,
   clearAllSurfaceContexts,
   clearLayoutModeAdapter,
   compactItems,
-  I as compactLayoutDocument,
+  l2 as compactLayoutDocument,
   w as computed,
   createApiCustomerAdapter,
   createApiLoginAdapter,
-  createApiOrdersAdapter,
+  createApiOrderAdapter,
   createApiProductAdapter,
   createApiSchedulesAdapter,
   createApiSubscriptionAdapter,
   createBlockInstance,
-  J as createBlockInstanceFromJSON,
-  K as createBlockInstanceFromObject,
-  N as createCeRenderer,
+  y as createBlockInstanceFromJSON,
+  g as createBlockInstanceFromObject,
+  z as createCeRenderer,
   createContext,
   createCustomerService,
-  O as createDefaultLayoutDocument,
+  m as createDefaultLayoutDocument,
   createLoginService,
   createMockCustomerAdapter,
   createMockLoginAdapter,
-  createMockOrdersAdapter,
+  createMockOrderAdapter,
   createMockProductAdapter,
   createMockRouterService,
   createMockSchedulesAdapter,
   createMockSubscriptionAdapter,
   createMockWorkflowApiAdapter,
-  createOrdersService,
+  createOrderService,
+  createOverlayService,
   createProductService,
   createRouterService,
   createSchedulesService,
-  Q as createSelectedBlock,
+  A as createSelectedBlock,
   createSettingsService,
   createShopService,
   createState,
   createSubscriptionService,
-  R as createThemeState,
-  U as createTranslationService,
+  n as createThemeState,
+  o2 as createTranslationService,
   createWorkflowApiAdapter,
   createWorkflowService,
   defineBlock,
-  V as defineBlockRuntime,
-  W as deriveLayout,
+  D as defineBlockRuntime,
+  defineOverlayWrapper,
+  p as deriveLayout,
   E as effect,
   emitLayoutCommand,
   emitLayoutSetRects,
-  X as expandFillLayoutDocument,
+  q2 as expandFillLayoutDocument,
   findFreeRect,
   getActiveSurfaceContext,
   getDefaultBlockForAction,
   getDefinedBlocks,
+  F as getDevtoolsBlockState,
   getLayoutModeAdapter,
   gridV1Engine,
   hasDefaultBlockForAction,
-  Y as hasRenderedContent,
-  Z as indexOverrides,
+  G as hasRenderedContent,
+  s as indexOverrides,
   i as injectContext,
   insertRectRelative,
-  _ as isEditorPreview,
-  a as isStubDefinition,
-  $ as layoutScopeSelector,
-  a0 as layoutSystemEnabled,
+  H as isEditorPreview,
+  b as isStubDefinition,
+  t2 as layoutScopeSelector,
+  I as layoutSystemEnabled,
   loadBlockRegistry,
   loginService,
   o as onRegisterBlock,
-  a1 as projectToCss,
-  p as projectToGridStack,
-  a2 as provideContext,
-  a3 as readingOrder,
-  e as reconcileLayout,
-  a4 as rectsOverlap,
+  u2 as projectToCss,
+  p2 as projectToGridStack,
+  J as provideContext,
+  v2 as readingOrder,
+  c2 as reconcileLayout,
+  w3 as rectsOverlap,
   registerBlock,
   registerLayoutModeAdapter,
   resetBreakpoint,
   r as resolveLayout,
-  a5 as serializeBlocks,
+  k as serializeBlocks,
   setActiveSurfaceContext,
+  K as setDevtoolsBlockProp,
   setLayoutCommandDispatcher,
   setLayoutCommandEmitter,
-  a6 as setLayoutSystemEnabled,
+  l as setLayoutSystemEnabled,
   d as signal,
   subscribeContext,
-  a7 as untracked,
+  L as untracked,
   waitForDevBlocksUrl,
   w2 as withWrapper
 };