@cmssy/cli 12.14.0 → 12.14.2

package/assets/init/astro/src/cmssy/layout-slot.tsx

@@ -63,6 +63,8 @@ export default function LayoutSlot({
             locale={locale}
             defaultLocale={defaultLocale}
             context={context}
+            resolvedContent={resolvedContent?.[block.id]}
+            data={data?.[block.id]}
           />
         ))}
     </>

package/assets/init/astro/src/components/Blocks.tsx

@@ -7,11 +7,15 @@ export function Blocks({
   locale,
   defaultLocale,
   enabledLocales,
+  blockData,
+  blockContent,
 }: {
   page: CmssyPageData;
   locale: string;
   defaultLocale: string;
   enabledLocales: string[];
+  blockData: Record<string, unknown>;
+  blockContent: Record<string, Record<string, unknown>>;
 }) {
   const blockMap = buildBlockMap(blocks);
   const context = buildBlockContext(locale, defaultLocale, enabledLocales);
@@ -26,6 +30,8 @@ export function Blocks({
           locale={locale}
           defaultLocale={defaultLocale}
           context={context}
+          resolvedContent={blockContent[block.id]}
+          data={blockData[block.id]}
         />
       ))}
     </>

package/assets/init/astro/src/pages/[...path].astro

@@ -1,5 +1,9 @@
 ---
 import { loadCmssyPage } from "@cmssy/astro";
+import {
+  resolveEditorBlockData,
+  resolveEditorLayoutBlockData,
+} from "@cmssy/react";
 import { cmssy } from "../cmssy.config";
 import { blocks } from "../cmssy/blocks";
 import { Blocks } from "../components/Blocks";
@@ -17,6 +21,28 @@ const { page, layouts, locale, defaultLocale, enabledLocales } = await loadCmssy
 if (!page) {
   Astro.response.status = 404;
 }
+
+const { data: blockData, content: blockContent } = await resolveEditorBlockData({
+  page,
+  blocks,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  config: cmssy,
+});
+
+const layoutSlot = {
+  groups: layouts,
+  blocks,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  config: cmssy,
+};
+const [header, footer] = await Promise.all([
+  resolveEditorLayoutBlockData({ ...layoutSlot, position: "header" }),
+  resolveEditorLayoutBlockData({ ...layoutSlot, position: "footer" }),
+]);
 ---
 
 <html lang={locale}>
@@ -31,6 +57,8 @@ if (!page) {
       locale={locale}
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
+      data={header.data}
+      resolvedContent={header.content}
     />
     {
       page ? (
@@ -39,6 +67,8 @@ if (!page) {
           locale={locale}
           defaultLocale={defaultLocale}
           enabledLocales={enabledLocales}
+          blockData={blockData}
+          blockContent={blockContent}
         />
       ) : (
         <main><h1>Not found</h1></main>
@@ -50,6 +80,8 @@ if (!page) {
       locale={locale}
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
+      data={footer.data}
+      resolvedContent={footer.content}
     />
   </body>
 </html>

package/assets/init/remix/app/cmssy/layout-slot.tsx

@@ -63,6 +63,8 @@ export function LayoutSlot({
             locale={locale}
             defaultLocale={defaultLocale}
             context={context}
+            resolvedContent={resolvedContent?.[block.id]}
+            data={data?.[block.id]}
           />
         ))}
     </>

package/assets/init/remix/app/routes/page.tsx

@@ -1,4 +1,12 @@
-import { CmssyBlock, buildBlockContext, buildBlockMap } from "@cmssy/react";
+import {
+  CmssyBlock,
+  buildBlockContext,
+  buildBlockMap,
+  resolveEditorBlockData,
+  resolveEditorLayoutBlockData,
+  type EditorBlockData,
+  type ResolveLayoutBlockDataOptions,
+} from "@cmssy/react";
 import { createCmssyHeaders, createCmssyLoader } from "@cmssy/remix";
 import { cmssy } from "../../cmssy.config";
 import { blocks } from "../cmssy/blocks";
@@ -6,7 +14,53 @@ import { CmssyEditor } from "../cmssy/editor";
 import { LayoutSlot } from "../cmssy/layout-slot";
 import type { Route } from "./+types/page";
 
-export const loader = createCmssyLoader(cmssy, { blocks });
+const cmssyLoader = createCmssyLoader(cmssy, { blocks });
+
+type Position = "header" | "footer";
+
+async function resolveSlot(
+  options: Omit<ResolveLayoutBlockDataOptions, "position">,
+  position: Position,
+) {
+  const resolved = await resolveEditorLayoutBlockData({ ...options, position });
+  return { data: resolved.data, resolvedContent: resolved.content };
+}
+
+export async function loader(args: Route.LoaderArgs) {
+  const data = await cmssyLoader(args);
+  const resolved: EditorBlockData = data.isEdit
+    ? { data: {}, content: {} }
+    : await resolveEditorBlockData({
+        page: data.page,
+        blocks,
+        locale: data.locale,
+        defaultLocale: data.defaultLocale,
+        enabledLocales: data.enabledLocales,
+        config: cmssy,
+      });
+
+  const slotOptions = {
+    groups: data.layouts,
+    blocks,
+    locale: data.locale,
+    defaultLocale: data.defaultLocale,
+    enabledLocales: data.enabledLocales,
+    config: cmssy,
+  };
+  const [header, footer] = data.isEdit
+    ? [data.editorData?.header, data.editorData?.footer]
+    : await Promise.all([
+        resolveSlot(slotOptions, "header"),
+        resolveSlot(slotOptions, "footer"),
+      ]);
+
+  return {
+    ...data,
+    blockData: resolved.data,
+    blockContent: resolved.content,
+    layoutData: { header, footer },
+  };
+}
 
 export const headers = createCmssyHeaders(cmssy);
 
@@ -20,14 +74,16 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
     isEdit,
     editorOrigin,
     diagnostics,
-    editorData,
+    layoutData,
+    blockData,
+    blockContent,
   } = loaderData;
 
   if (diagnostics) {
     return <div dangerouslySetInnerHTML={{ __html: diagnostics }} />;
   }
 
-  const slot = (position: "header" | "footer") => (
+  const slot = (position: Position) => (
     <LayoutSlot
       groups={layouts}
       position={position}
@@ -35,8 +91,8 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
       defaultLocale={defaultLocale}
       enabledLocales={enabledLocales}
       edit={isEdit ? { editorOrigin } : undefined}
-      data={editorData?.[position]?.data}
-      resolvedContent={editorData?.[position]?.resolvedContent}
+      data={layoutData[position]?.data}
+      resolvedContent={layoutData[position]?.resolvedContent}
     />
   );
 
@@ -82,6 +138,8 @@ export default function CmssyPage({ loaderData }: Route.ComponentProps) {
             locale={locale}
             defaultLocale={defaultLocale}
             context={context}
+            resolvedContent={blockContent[block.id]}
+            data={blockData[block.id]}
           />
         ))}
       </main>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "12.14.0",
+  "version": "12.14.2",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -27,7 +27,7 @@
     "assets"
   ],
   "dependencies": {
-    "@cmssy/core": "12.14.0"
+    "@cmssy/core": "12.14.2"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",