@cmssy/react 0.13.0 → 0.14.0

package/dist/client.cjs

@@ -485,12 +485,8 @@ function getBlockContentForLanguage(content, locale, defaultLocale = "en", avail
   const chosen = localeMap[locale] ?? localeMap[defaultLocale] ?? localeMap[fallbackKey];
   return { ...nonTranslatable, ...chosen };
 }
-function mergeBlockValues(content, style, advanced) {
-  return {
-    ...content,
-    ...isPlainObject(style) ? style : {},
-    ...isPlainObject(advanced) ? advanced : {}
-  };
+function asBucket(value) {
+  return isPlainObject(value) ? value : {};
 }
 var WARN_CAP = 256;
 var warned = /* @__PURE__ */ new Set();
@@ -514,8 +510,7 @@ function CmssyBlock({
 }) {
   const Component = Object.hasOwn(blockMap, block.type) ? blockMap[block.type] : void 0;
   const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
-  const resolved = patchedContent ? { ...base, ...patchedContent } : base;
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
+  const content = patchedContent ? { ...base, ...patchedContent } : base;
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
@@ -524,7 +519,12 @@ function CmssyBlock({
       "data-layout-position": layoutPosition,
       draggable: editable || void 0,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? react.createElement(Component, { content, context }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
+      children: Component ? react.createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context
+      }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
     }
   );
 }

package/dist/client.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-ClCU8FZN.cjs';
-export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-ClCU8FZN.cjs';
+import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-D5duQ6QF.cjs';
+export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-D5duQ6QF.cjs';
 import { ReactNode } from 'react';
 import '@cmssy/types';
 

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-ClCU8FZN.js';
-export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-ClCU8FZN.js';
+import { B as BlockSchema, a as BlockMeta, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, d as CmssyLayoutGroup, e as CmssyLocaleContext, f as CmssyCart, g as CmssyOrder, h as CmssyProduct } from './commerce-queries-D5duQ6QF.js';
+export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-D5duQ6QF.js';
 import { ReactNode } from 'react';
 import '@cmssy/types';
 

package/dist/client.js

@@ -483,12 +483,8 @@ function getBlockContentForLanguage(content, locale, defaultLocale = "en", avail
   const chosen = localeMap[locale] ?? localeMap[defaultLocale] ?? localeMap[fallbackKey];
   return { ...nonTranslatable, ...chosen };
 }
-function mergeBlockValues(content, style, advanced) {
-  return {
-    ...content,
-    ...isPlainObject(style) ? style : {},
-    ...isPlainObject(advanced) ? advanced : {}
-  };
+function asBucket(value) {
+  return isPlainObject(value) ? value : {};
 }
 var WARN_CAP = 256;
 var warned = /* @__PURE__ */ new Set();
@@ -512,8 +508,7 @@ function CmssyBlock({
 }) {
   const Component = Object.hasOwn(blockMap, block.type) ? blockMap[block.type] : void 0;
   const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
-  const resolved = patchedContent ? { ...base, ...patchedContent } : base;
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
+  const content = patchedContent ? { ...base, ...patchedContent } : base;
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -522,7 +517,12 @@ function CmssyBlock({
       "data-layout-position": layoutPosition,
       draggable: editable || void 0,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? createElement(Component, { content, context }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
+      children: Component ? createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context
+      }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
     }
   );
 }

package/dist/{commerce-queries-ClCU8FZN.d.cts → commerce-queries-D5duQ6QF.d.cts}

@@ -340,11 +340,13 @@ interface BlockDefinition {
     loader?: BlockLoader;
     component: ComponentType<{
         content: Record<string, unknown>;
+        style?: Record<string, unknown>;
+        advanced?: Record<string, unknown>;
         context?: CmssyBlockContext;
         data?: unknown;
     }>;
 }
-declare function defineBlock<C extends Record<string, unknown>, D = unknown>(def: {
+declare function defineBlock<C extends Record<string, unknown>, D = unknown, S extends Record<string, unknown> = Record<string, unknown>, A extends Record<string, unknown> = Record<string, unknown>>(def: {
     type: string;
     label?: string;
     category?: string;
@@ -358,12 +360,16 @@ declare function defineBlock<C extends Record<string, unknown>, D = unknown>(def
     }) => Promise<D> | D;
     component: ComponentType<{
         content: C;
+        style?: S;
+        advanced?: A;
         context?: CmssyBlockContext;
         data?: D;
     }>;
 }): BlockDefinition;
 type BlockMap = Record<string, ComponentType<{
     content: Record<string, unknown>;
+    style?: Record<string, unknown>;
+    advanced?: Record<string, unknown>;
     context?: CmssyBlockContext;
     data?: unknown;
 }>>;

package/dist/{commerce-queries-ClCU8FZN.d.ts → commerce-queries-D5duQ6QF.d.ts}

@@ -340,11 +340,13 @@ interface BlockDefinition {
     loader?: BlockLoader;
     component: ComponentType<{
         content: Record<string, unknown>;
+        style?: Record<string, unknown>;
+        advanced?: Record<string, unknown>;
         context?: CmssyBlockContext;
         data?: unknown;
     }>;
 }
-declare function defineBlock<C extends Record<string, unknown>, D = unknown>(def: {
+declare function defineBlock<C extends Record<string, unknown>, D = unknown, S extends Record<string, unknown> = Record<string, unknown>, A extends Record<string, unknown> = Record<string, unknown>>(def: {
     type: string;
     label?: string;
     category?: string;
@@ -358,12 +360,16 @@ declare function defineBlock<C extends Record<string, unknown>, D = unknown>(def
     }) => Promise<D> | D;
     component: ComponentType<{
         content: C;
+        style?: S;
+        advanced?: A;
         context?: CmssyBlockContext;
         data?: D;
     }>;
 }): BlockDefinition;
 type BlockMap = Record<string, ComponentType<{
     content: Record<string, unknown>;
+    style?: Record<string, unknown>;
+    advanced?: Record<string, unknown>;
     context?: CmssyBlockContext;
     data?: unknown;
 }>>;

package/dist/index.cjs

@@ -101,12 +101,8 @@ function getBlockContentForLanguage(content, locale, defaultLocale = "en", avail
   const chosen = localeMap[locale] ?? localeMap[defaultLocale] ?? localeMap[fallbackKey];
   return { ...nonTranslatable, ...chosen };
 }
-function mergeBlockValues(content, style, advanced) {
-  return {
-    ...content,
-    ...isPlainObject(style) ? style : {},
-    ...isPlainObject(advanced) ? advanced : {}
-  };
+function asBucket(value) {
+  return isPlainObject(value) ? value : {};
 }
 
 // src/components/block-context.ts
@@ -136,20 +132,25 @@ function UnknownBlock({ type }) {
 function renderResolvedBlock(block, map, locale, defaultLocale, options = {}) {
   const { context, data, resolvedContent, enabledLocales } = options;
   const Component = Object.hasOwn(map, block.type) ? map[block.type] : void 0;
-  const resolved = resolvedContent ?? getBlockContentForLanguage(
+  const content = resolvedContent ?? getBlockContentForLanguage(
     block.content,
     locale,
     defaultLocale,
     enabledLocales?.length ? enabledLocales : void 0
   );
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? react.createElement(Component, { content, context, data }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
+      children: Component ? react.createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context,
+        data
+      }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
     },
     block.id
   );
@@ -897,8 +898,7 @@ function CmssyBlock({
 }) {
   const Component = Object.hasOwn(blockMap, block.type) ? blockMap[block.type] : void 0;
   const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
-  const resolved = patchedContent ? { ...base, ...patchedContent } : base;
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
+  const content = patchedContent ? { ...base, ...patchedContent } : base;
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
@@ -907,7 +907,12 @@ function CmssyBlock({
       "data-layout-position": layoutPosition,
       draggable: editable || void 0,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? react.createElement(Component, { content, context }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
+      children: Component ? react.createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context
+      }) : /* @__PURE__ */ jsxRuntime.jsx(UnknownBlock, { type: block.type })
     }
   );
 }

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-ClCU8FZN.cjs';
-export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl } from './commerce-queries-ClCU8FZN.cjs';
+import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-D5duQ6QF.cjs';
+export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl } from './commerce-queries-D5duQ6QF.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-ClCU8FZN.js';
-export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl } from './commerce-queries-ClCU8FZN.js';
+import { F as FieldDefinition, C as CmssyPageData, b as BlockDefinition, c as CmssyFormDefinition, n as CmssyBlockAuthContext, o as CmssyBlockWorkspace, d as CmssyLayoutGroup, E as EditorToAppMessage, A as AppToEditorMessage, p as FetchLike, q as CmssyClientConfig, r as CmssySiteConfig, R as RawBlock, e as CmssyLocaleContext, s as BlockMap, t as CmssyBlockContext } from './commerce-queries-D5duQ6QF.js';
+export { a as BlockMeta, u as BlockRect, B as BlockSchema, v as BoundsMessage, w as BuildBlockContextExtra, x as ClickMessage, y as CmssyBlockMember, z as CmssyBranding, f as CmssyCart, i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, D as CmssyFormField, G as CmssyFormSettings, H as CmssyFormSubmitResponse, I as CmssyLocalizedValue, J as CmssyModelDefinition, K as CmssyModelRecord, g as CmssyOrder, L as CmssyPageMeta, M as CmssyPageSummary, h as CmssyProduct, m as CmssyProductVariant, N as CmssyRecordList, O as DEFAULT_CMSSY_API_URL, P as FORM_QUERY, Q as FetchLikeResponse, S as FetchPageOptions, T as MODEL_DEFINITIONS_QUERY, U as MODEL_RECORDS_QUERY, V as PROTOCOL_VERSION, W as ParentReadyMessage, X as PatchMessage, Y as RawLayoutBlock, Z as ReadyMessage, _ as SITE_CONFIG_QUERY, $ as SUBMIT_FORM_MUTATION, a0 as SelectMessage, a1 as SubmitFormInput, a2 as blocksToMeta, a3 as blocksToSchemas, a4 as buildBlockContext, a5 as buildBlockMap, a6 as defineBlock, a7 as fetchLayouts, a8 as fetchPage, a9 as fetchPageById, aa as fetchPageMeta, ab as fetchPages, ac as isProtocolCompatible, ad as normalizeSlug, ae as resolveApiUrl } from './commerce-queries-D5duQ6QF.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';

package/dist/index.js

@@ -99,12 +99,8 @@ function getBlockContentForLanguage(content, locale, defaultLocale = "en", avail
   const chosen = localeMap[locale] ?? localeMap[defaultLocale] ?? localeMap[fallbackKey];
   return { ...nonTranslatable, ...chosen };
 }
-function mergeBlockValues(content, style, advanced) {
-  return {
-    ...content,
-    ...isPlainObject(style) ? style : {},
-    ...isPlainObject(advanced) ? advanced : {}
-  };
+function asBucket(value) {
+  return isPlainObject(value) ? value : {};
 }
 
 // src/components/block-context.ts
@@ -134,20 +130,25 @@ function UnknownBlock({ type }) {
 function renderResolvedBlock(block, map, locale, defaultLocale, options = {}) {
   const { context, data, resolvedContent, enabledLocales } = options;
   const Component = Object.hasOwn(map, block.type) ? map[block.type] : void 0;
-  const resolved = resolvedContent ?? getBlockContentForLanguage(
+  const content = resolvedContent ?? getBlockContentForLanguage(
     block.content,
     locale,
     defaultLocale,
     enabledLocales?.length ? enabledLocales : void 0
   );
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
   return /* @__PURE__ */ jsx(
     "div",
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? createElement(Component, { content, context, data }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
+      children: Component ? createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context,
+        data
+      }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
     },
     block.id
   );
@@ -895,8 +896,7 @@ function CmssyBlock({
 }) {
   const Component = Object.hasOwn(blockMap, block.type) ? blockMap[block.type] : void 0;
   const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
-  const resolved = patchedContent ? { ...base, ...patchedContent } : base;
-  const content = mergeBlockValues(resolved, block.style, block.advanced);
+  const content = patchedContent ? { ...base, ...patchedContent } : base;
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -905,7 +905,12 @@ function CmssyBlock({
       "data-layout-position": layoutPosition,
       draggable: editable || void 0,
       style: Component ? void 0 : { display: "none" },
-      children: Component ? createElement(Component, { content, context }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
+      children: Component ? createElement(Component, {
+        content,
+        style: asBucket(block.style),
+        advanced: asBucket(block.advanced),
+        context
+      }) : /* @__PURE__ */ jsx(UnknownBlock, { type: block.type })
     }
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",