@cmssy/react 0.13.0 → 0.16.0

package/README.md

@@ -39,7 +39,7 @@ the CMS at runtime.
 ```tsx
 import { fetchPage, CmssyServerPage } from "@cmssy/react";
 
-const page = await fetchPage({ workspaceSlug: "acme" }, pathSegments);
+const page = await fetchPage({ org: "acme-org", workspaceSlug: "acme" }, pathSegments);
 
 return <CmssyServerPage page={page} blocks={blocks} locale="en" />;
 ```
@@ -56,7 +56,7 @@ the exported documents):
 ```ts
 import { createCmssyClient, MODEL_RECORDS_QUERY } from "@cmssy/react";
 
-const cmssy = createCmssyClient({ workspaceSlug: "acme" });
+const cmssy = createCmssyClient({ org: "acme-org", workspaceSlug: "acme" });
 
 // raw query (you own scoping)
 await cmssy.query(MY_QUERY, vars);

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-D9lXIaCQ.cjs';
+export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-D9lXIaCQ.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-D9lXIaCQ.js';
+export { i as CmssyCartDiscount, j as CmssyCartItem, k as CmssyCartItemSnapshot, l as CmssyOrderItem, m as CmssyProductVariant } from './commerce-queries-D9lXIaCQ.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-D9lXIaCQ.d.cts}

@@ -8,9 +8,22 @@ import { FieldConditionGroup, FieldType } from '@cmssy/types';
  */
 declare const DEFAULT_CMSSY_API_URL = "https://api.cmssy.io/graphql";
 declare function resolveApiUrl(apiUrl: string | undefined): string;
+/**
+ * Public delivery endpoint for a workspace: the org-scoped path
+ * `{base}/public/{orgSlug}/{workspaceSlug}/graphql`. `apiUrl` is the GraphQL
+ * base (its trailing `/graphql` is stripped); the org path is what tells the
+ * backend which workspace to serve, so slugs only need to be unique per org.
+ */
+declare function resolvePublicUrl(config: CmssyClientConfig): string;
 interface CmssyClientConfig {
-    /** Full GraphQL delivery endpoint. Defaults to {@link DEFAULT_CMSSY_API_URL}. */
+    /**
+     * Full GraphQL endpoint (used as-is for authenticated requests). Defaults to
+     * {@link DEFAULT_CMSSY_API_URL}. Public reads strip its trailing `/graphql`
+     * and append the org-scoped path (see {@link resolvePublicUrl}).
+     */
     apiUrl?: string;
+    /** Organization slug - part of the org-scoped delivery path. */
+    org: string;
     workspaceSlug: string;
 }
 interface FetchLikeResponse {
@@ -94,7 +107,7 @@ interface CmssySiteConfig {
     previewUrl: string | null;
     branding: CmssyBranding | null;
 }
-declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  publicSiteConfig(workspaceSlug: $workspaceSlug) {\n    id\n    workspaceId\n    siteName\n    defaultLanguage\n    enabledLanguages\n    enabledFeatures\n    notFoundPageId\n    previewUrl\n    branding {\n      brandName\n      logoUrl\n      faviconUrl\n      ogImageUrl\n    }\n  }\n}";
+declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";
 interface CmssyModelDefinition {
     id: string;
     name: string;
@@ -340,11 +353,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 +373,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;
 }>>;
@@ -469,4 +488,4 @@ interface CmssyOrder {
     createdAt?: string;
 }
 
-export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };
+export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, resolvePublicUrl as af, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };

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

@@ -8,9 +8,22 @@ import { FieldConditionGroup, FieldType } from '@cmssy/types';
  */
 declare const DEFAULT_CMSSY_API_URL = "https://api.cmssy.io/graphql";
 declare function resolveApiUrl(apiUrl: string | undefined): string;
+/**
+ * Public delivery endpoint for a workspace: the org-scoped path
+ * `{base}/public/{orgSlug}/{workspaceSlug}/graphql`. `apiUrl` is the GraphQL
+ * base (its trailing `/graphql` is stripped); the org path is what tells the
+ * backend which workspace to serve, so slugs only need to be unique per org.
+ */
+declare function resolvePublicUrl(config: CmssyClientConfig): string;
 interface CmssyClientConfig {
-    /** Full GraphQL delivery endpoint. Defaults to {@link DEFAULT_CMSSY_API_URL}. */
+    /**
+     * Full GraphQL endpoint (used as-is for authenticated requests). Defaults to
+     * {@link DEFAULT_CMSSY_API_URL}. Public reads strip its trailing `/graphql`
+     * and append the org-scoped path (see {@link resolvePublicUrl}).
+     */
     apiUrl?: string;
+    /** Organization slug - part of the org-scoped delivery path. */
+    org: string;
     workspaceSlug: string;
 }
 interface FetchLikeResponse {
@@ -94,7 +107,7 @@ interface CmssySiteConfig {
     previewUrl: string | null;
     branding: CmssyBranding | null;
 }
-declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  publicSiteConfig(workspaceSlug: $workspaceSlug) {\n    id\n    workspaceId\n    siteName\n    defaultLanguage\n    enabledLanguages\n    enabledFeatures\n    notFoundPageId\n    previewUrl\n    branding {\n      brandName\n      logoUrl\n      faviconUrl\n      ogImageUrl\n    }\n  }\n}";
+declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";
 interface CmssyModelDefinition {
     id: string;
     name: string;
@@ -340,11 +353,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 +373,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;
 }>>;
@@ -469,4 +488,4 @@ interface CmssyOrder {
     createdAt?: string;
 }
 
-export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };
+export { SUBMIT_FORM_MUTATION as $, type AppToEditorMessage as A, type BlockSchema as B, type CmssyPageData as C, type CmssyFormField as D, type EditorToAppMessage as E, type FieldDefinition as F, type CmssyFormSettings as G, type CmssyFormSubmitResponse as H, type CmssyLocalizedValue as I, type CmssyModelDefinition as J, type CmssyModelRecord as K, type CmssyPageMeta as L, type CmssyPageSummary as M, type CmssyRecordList as N, DEFAULT_CMSSY_API_URL as O, FORM_QUERY as P, type FetchLikeResponse as Q, type RawBlock as R, type FetchPageOptions as S, MODEL_DEFINITIONS_QUERY as T, MODEL_RECORDS_QUERY as U, PROTOCOL_VERSION as V, type ParentReadyMessage as W, type PatchMessage as X, type RawLayoutBlock as Y, type ReadyMessage as Z, SITE_CONFIG_QUERY as _, type BlockMeta as a, type SelectMessage as a0, type SubmitFormInput as a1, blocksToMeta as a2, blocksToSchemas as a3, buildBlockContext as a4, buildBlockMap as a5, defineBlock as a6, fetchLayouts as a7, fetchPage as a8, fetchPageById as a9, fetchPageMeta as aa, fetchPages as ab, isProtocolCompatible as ac, normalizeSlug as ad, resolveApiUrl as ae, resolvePublicUrl as af, type BlockDefinition as b, type CmssyFormDefinition as c, type CmssyLayoutGroup as d, type CmssyLocaleContext as e, type CmssyCart as f, type CmssyOrder as g, type CmssyProduct as h, type CmssyCartDiscount as i, type CmssyCartItem as j, type CmssyCartItemSnapshot as k, type CmssyOrderItem as l, type CmssyProductVariant as m, type CmssyBlockAuthContext as n, type CmssyBlockWorkspace as o, type FetchLike as p, type CmssyClientConfig as q, type CmssySiteConfig as r, type BlockMap as s, type CmssyBlockContext as t, type BlockRect as u, type BoundsMessage as v, type BuildBlockContextExtra as w, type ClickMessage as x, type CmssyBlockMember as y, type CmssyBranding as z };

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
   );
@@ -315,6 +316,10 @@ function resolveApiUrl(apiUrl) {
   const fromEnv = env?.CMSSY_API_URL?.trim() ?? "";
   return fromEnv.length > 0 ? fromEnv : DEFAULT_CMSSY_API_URL;
 }
+function resolvePublicUrl(config) {
+  const base = resolveApiUrl(config.apiUrl).replace(/\/graphql\/?$/, "");
+  return `${base}/public/${config.org}/${config.workspaceSlug}/graphql`;
+}
 var PUBLIC_PAGE_QUERY = `query PublicPage($workspaceSlug: String!, $slug: String!, $previewSecret: String) {
   public {
     page {
@@ -411,7 +416,7 @@ async function fetchPage(config, path, options = {}) {
       headers["x-workspace-id"] = options.workspaceId;
     }
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers,
     body: JSON.stringify({
@@ -460,7 +465,7 @@ async function fetchPageById(config, pageId, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -504,7 +509,7 @@ async function fetchPages(config, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -536,7 +541,7 @@ async function fetchPageMeta(config, path, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -570,7 +575,7 @@ async function fetchLayouts(config, path, options = {}) {
   }
   const trimmedSecret = options.previewSecret?.trim();
   const previewSecret = trimmedSecret ? trimmedSecret : null;
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -607,7 +612,8 @@ async function graphqlRequest(config, query, variables, options = {}, label = "r
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const url = options.public ? resolvePublicUrl(config) : resolveApiUrl(config.apiUrl);
+  const response = await doFetch(url, {
     method: "POST",
     headers: { "content-type": "application/json", ...options.headers },
     body: JSON.stringify({ query, variables }),
@@ -640,20 +646,22 @@ async function graphqlRequest(config, query, variables, options = {}, label = "r
 
 // src/data/queries.ts
 var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
-  publicSiteConfig(workspaceSlug: $workspaceSlug) {
-    id
-    workspaceId
-    siteName
-    defaultLanguage
-    enabledLanguages
-    enabledFeatures
-    notFoundPageId
-    previewUrl
-    branding {
-      brandName
-      logoUrl
-      faviconUrl
-      ogImageUrl
+  public {
+    siteConfig(workspaceSlug: $workspaceSlug) {
+      id
+      workspaceId
+      siteName
+      defaultLanguage
+      enabledLanguages
+      enabledFeatures
+      notFoundPageId
+      previewUrl
+      branding {
+        brandName
+        logoUrl
+        faviconUrl
+        ogImageUrl
+      }
     }
   }
 }`;
@@ -699,10 +707,10 @@ async function fetchSiteConfig(config, options = {}) {
     config,
     SITE_CONFIG_QUERY,
     { workspaceSlug: config.workspaceSlug },
-    options,
+    { ...options, public: true },
     "site config query"
   );
-  return data.publicSiteConfig ?? null;
+  return data.public?.siteConfig ?? null;
 }
 async function resolveWorkspaceId(config, options = {}) {
   const siteConfig = await fetchSiteConfig(config, options);
@@ -805,7 +813,7 @@ var TTL_MS = 6e4;
 var MAX_ENTRIES = 64;
 var cache = /* @__PURE__ */ new Map();
 async function resolveSiteLocales(config, options) {
-  const key = `${resolveApiUrl(config.apiUrl)}::${config.workspaceSlug}`;
+  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
   const cached = cache.get(key);
   if (cached && cached.expires > Date.now()) return cached.value;
   cache.delete(key);
@@ -815,10 +823,10 @@ async function resolveSiteLocales(config, options) {
       config,
       SITE_CONFIG_QUERY,
       { workspaceSlug: config.workspaceSlug },
-      options,
+      { ...options, public: true },
       "site config"
     );
-    const siteConfig = data.publicSiteConfig;
+    const siteConfig = data.public?.siteConfig ?? null;
     const defaultLocale = siteConfig?.defaultLanguage || "en";
     const enabled = siteConfig?.enabledLanguages ?? [];
     value = {
@@ -897,8 +905,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 +914,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 })
     }
   );
 }
@@ -953,6 +965,7 @@ exports.parseEditorMessage = parseEditorMessage;
 exports.postToEditor = postToEditor;
 exports.resolveApiUrl = resolveApiUrl;
 exports.resolveForms = resolveForms;
+exports.resolvePublicUrl = resolvePublicUrl;
 exports.resolveSiteLocales = resolveSiteLocales;
 exports.resolveWorkspaceId = resolveWorkspaceId;
 exports.splitLocaleFromPath = splitLocaleFromPath;

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-D9lXIaCQ.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, af as resolvePublicUrl } from './commerce-queries-D9lXIaCQ.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';
@@ -76,6 +76,12 @@ interface GraphqlRequestOptions {
     fetch?: FetchLike;
     signal?: AbortSignal;
     headers?: Record<string, string>;
+    /**
+     * Route through the org-scoped public delivery path instead of the base
+     * `/graphql` endpoint. Set for unauthenticated public queries so the backend
+     * resolves the workspace from the URL rather than a global slug lookup.
+     */
+    public?: boolean;
 }
 declare function graphqlRequest<T>(config: CmssyClientConfig, query: string, variables: Record<string, unknown>, options?: GraphqlRequestOptions, label?: string): Promise<T>;
 

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-D9lXIaCQ.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, af as resolvePublicUrl } from './commerce-queries-D9lXIaCQ.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldType, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';
@@ -76,6 +76,12 @@ interface GraphqlRequestOptions {
     fetch?: FetchLike;
     signal?: AbortSignal;
     headers?: Record<string, string>;
+    /**
+     * Route through the org-scoped public delivery path instead of the base
+     * `/graphql` endpoint. Set for unauthenticated public queries so the backend
+     * resolves the workspace from the URL rather than a global slug lookup.
+     */
+    public?: boolean;
 }
 declare function graphqlRequest<T>(config: CmssyClientConfig, query: string, variables: Record<string, unknown>, options?: GraphqlRequestOptions, label?: string): Promise<T>;
 

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
   );
@@ -313,6 +314,10 @@ function resolveApiUrl(apiUrl) {
   const fromEnv = env?.CMSSY_API_URL?.trim() ?? "";
   return fromEnv.length > 0 ? fromEnv : DEFAULT_CMSSY_API_URL;
 }
+function resolvePublicUrl(config) {
+  const base = resolveApiUrl(config.apiUrl).replace(/\/graphql\/?$/, "");
+  return `${base}/public/${config.org}/${config.workspaceSlug}/graphql`;
+}
 var PUBLIC_PAGE_QUERY = `query PublicPage($workspaceSlug: String!, $slug: String!, $previewSecret: String) {
   public {
     page {
@@ -409,7 +414,7 @@ async function fetchPage(config, path, options = {}) {
       headers["x-workspace-id"] = options.workspaceId;
     }
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers,
     body: JSON.stringify({
@@ -458,7 +463,7 @@ async function fetchPageById(config, pageId, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -502,7 +507,7 @@ async function fetchPages(config, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -534,7 +539,7 @@ async function fetchPageMeta(config, path, options = {}) {
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -568,7 +573,7 @@ async function fetchLayouts(config, path, options = {}) {
   }
   const trimmedSecret = options.previewSecret?.trim();
   const previewSecret = trimmedSecret ? trimmedSecret : null;
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const response = await doFetch(resolvePublicUrl(config), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -605,7 +610,8 @@ async function graphqlRequest(config, query, variables, options = {}, label = "r
       "cmssy: no fetch implementation available - pass options.fetch"
     );
   }
-  const response = await doFetch(resolveApiUrl(config.apiUrl), {
+  const url = options.public ? resolvePublicUrl(config) : resolveApiUrl(config.apiUrl);
+  const response = await doFetch(url, {
     method: "POST",
     headers: { "content-type": "application/json", ...options.headers },
     body: JSON.stringify({ query, variables }),
@@ -638,20 +644,22 @@ async function graphqlRequest(config, query, variables, options = {}, label = "r
 
 // src/data/queries.ts
 var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
-  publicSiteConfig(workspaceSlug: $workspaceSlug) {
-    id
-    workspaceId
-    siteName
-    defaultLanguage
-    enabledLanguages
-    enabledFeatures
-    notFoundPageId
-    previewUrl
-    branding {
-      brandName
-      logoUrl
-      faviconUrl
-      ogImageUrl
+  public {
+    siteConfig(workspaceSlug: $workspaceSlug) {
+      id
+      workspaceId
+      siteName
+      defaultLanguage
+      enabledLanguages
+      enabledFeatures
+      notFoundPageId
+      previewUrl
+      branding {
+        brandName
+        logoUrl
+        faviconUrl
+        ogImageUrl
+      }
     }
   }
 }`;
@@ -697,10 +705,10 @@ async function fetchSiteConfig(config, options = {}) {
     config,
     SITE_CONFIG_QUERY,
     { workspaceSlug: config.workspaceSlug },
-    options,
+    { ...options, public: true },
     "site config query"
   );
-  return data.publicSiteConfig ?? null;
+  return data.public?.siteConfig ?? null;
 }
 async function resolveWorkspaceId(config, options = {}) {
   const siteConfig = await fetchSiteConfig(config, options);
@@ -803,7 +811,7 @@ var TTL_MS = 6e4;
 var MAX_ENTRIES = 64;
 var cache = /* @__PURE__ */ new Map();
 async function resolveSiteLocales(config, options) {
-  const key = `${resolveApiUrl(config.apiUrl)}::${config.workspaceSlug}`;
+  const key = `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
   const cached = cache.get(key);
   if (cached && cached.expires > Date.now()) return cached.value;
   cache.delete(key);
@@ -813,10 +821,10 @@ async function resolveSiteLocales(config, options) {
       config,
       SITE_CONFIG_QUERY,
       { workspaceSlug: config.workspaceSlug },
-      options,
+      { ...options, public: true },
       "site config"
     );
-    const siteConfig = data.publicSiteConfig;
+    const siteConfig = data.public?.siteConfig ?? null;
     const defaultLocale = siteConfig?.defaultLanguage || "en";
     const enabled = siteConfig?.enabledLanguages ?? [];
     value = {
@@ -895,8 +903,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,9 +912,14 @@ 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 })
     }
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, DEFAULT_CMSSY_API_URL, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, PROTOCOL_VERSION, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, UnknownBlock, blocksToMeta, blocksToSchemas, buildBlockContext, buildBlockMap, buildLocaleSwitchHref, collectFormIds, createCmssyClient, defineBlock, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, fields, getBlockContentForLanguage, graphqlRequest, isProtocolCompatible, localizeHref, localizeHtmlLinks, normalizeOrigin, normalizeSlug, parseEditorMessage, postToEditor, resolveApiUrl, resolveForms, resolveSiteLocales, resolveWorkspaceId, splitLocaleFromPath };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, DEFAULT_CMSSY_API_URL, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, PROTOCOL_VERSION, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, UnknownBlock, blocksToMeta, blocksToSchemas, buildBlockContext, buildBlockMap, buildLocaleSwitchHref, collectFormIds, createCmssyClient, defineBlock, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, fields, getBlockContentForLanguage, graphqlRequest, isProtocolCompatible, localizeHref, localizeHtmlLinks, normalizeOrigin, normalizeSlug, parseEditorMessage, postToEditor, resolveApiUrl, resolveForms, resolvePublicUrl, resolveSiteLocales, resolveWorkspaceId, splitLocaleFromPath };

package/package.json

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