@cmssy/astro 10.10.0 → 11.1.0

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 var core = require('@cmssy/core');
 var internal = require('@cmssy/core/internal');
+var react = require('@cmssy/react');
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -47,25 +48,57 @@ function cmssyMiddleware(config, options = {}) {
     return next();
   };
 }
-async function loadCmssyPage(config, request, url) {
+async function loadCmssyPage(config, request, url, options = {}) {
   const isEdit = request.headers.get(core.CMSSY_EDIT_HEADER) === "1";
-  const siteLocales = await internal.resolveSiteLocales(config);
   const segments = url.pathname.replace(/^\/cmssy-edit/, "").split("/").filter(Boolean);
-  const fromPath = internal.splitLocaleFromPath(segments, siteLocales);
-  const locale = request.headers.get(internal.CMSSY_LOCALE_HEADER) ?? fromPath.locale;
-  const path = fromPath.path;
-  const previewSecret = isEdit ? config.draftSecret : void 0;
-  const [page, layouts] = await Promise.all([
-    internal.fetchPage(config, path, { previewSecret }),
-    internal.fetchLayouts(config, path, { previewSecret })
-  ]);
+  const positions = options.positions ?? ["header", "footer"];
+  const blocks = options.blocks ?? [];
+  const headerLocale = request.headers.get(internal.CMSSY_LOCALE_HEADER) ?? void 0;
+  const slot = await react.resolveCmssyLayoutSlot(config, {
+    position: positions[0] ?? "header",
+    blocks,
+    editMode: isEdit,
+    path: segments,
+    locale: headerLocale,
+    appContext: options.appContext
+  });
+  const page = await internal.fetchPage(config, slot.path, {
+    previewSecret: isEdit ? config.draftSecret : void 0
+  });
+  let editorData;
+  if (isEdit && slot.data && slot.resolvedContent) {
+    editorData = {
+      [positions[0] ?? "header"]: {
+        data: slot.data,
+        resolvedContent: slot.resolvedContent
+      }
+    };
+    for (const position of positions.slice(1)) {
+      const extra = await react.resolveCmssyLayoutSlot(config, {
+        position,
+        blocks,
+        editMode: true,
+        path: segments,
+        locale: headerLocale,
+        appContext: options.appContext
+      });
+      if (extra.data && extra.resolvedContent) {
+        editorData[position] = {
+          data: extra.data,
+          resolvedContent: extra.resolvedContent
+        };
+      }
+    }
+  }
   return {
     page,
-    layouts,
-    locale,
-    defaultLocale: siteLocales.defaultLocale,
-    enabledLocales: siteLocales.locales,
-    isEdit
+    layouts: slot.groups,
+    locale: slot.locale,
+    defaultLocale: slot.defaultLocale,
+    enabledLocales: slot.enabledLocales,
+    isEdit,
+    editorData,
+    editorOrigin: slot.editorOrigin
   };
 }
 

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
 export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+import { BlockDefinition } from '@cmssy/react';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
 interface CmssyMiddlewareOptions {
@@ -40,14 +41,40 @@ interface CmssyPageResult {
     enabledLocales: string[];
     /** True for a verified editor request. The edit route renders the bridge. */
     isEdit: boolean;
+    /**
+     * Edit mode only, and only when `blocks` was passed: what the canvas needs,
+     * **keyed by position**. The header and the footer hold different blocks, so
+     * they resolve to different data - handing the footer the header's is the
+     * quiet version of this bug.
+     *
+     * Without `resolvedContent` a relation field shows the raw ids it stores,
+     * which is what this adapter did until now.
+     */
+    editorData?: Record<string, CmssyLayoutEditorData>;
+    editorOrigin?: string | string[];
+}
+interface CmssyLayoutEditorData {
+    data: Record<string, unknown>;
+    resolvedContent: Record<string, Record<string, unknown>>;
+}
+interface LoadCmssyPageOptions {
+    /**
+     * The block registry. Required to resolve the editor's layout data; omit it
+     * and the layouts still render, but the editor cannot fill them.
+     */
+    blocks?: BlockDefinition[];
+    /** Which positions the editor renders. Defaults to the header and footer. */
+    positions?: string[];
+    appContext?: Record<string, unknown>;
 }
 /**
- * Everything a cmssy page needs, from a plain Request. No framework globals: the
- * locale comes from the header the middleware set (falling back to the path, so
- * a prerendered page still knows its language), and the editor flag comes from
- * the same signal the Next adapter uses - because it is the same protocol, not
- * a Next protocol.
+ * Everything a cmssy page needs, from a plain Request. No framework globals.
+ *
+ * The layout half is `resolveCmssyLayoutSlot` from `@cmssy/react` - the same
+ * function the Next adapter uses, so the preview secret, the language and the
+ * editor data are decided in one place for all three frameworks rather than
+ * three times with two of them wrong.
  */
-declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL): Promise<CmssyPageResult>;
+declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL, options?: LoadCmssyPageOptions): Promise<CmssyPageResult>;
 
 export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, cmssyMiddleware, loadCmssyPage };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
 export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+import { BlockDefinition } from '@cmssy/react';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
 interface CmssyMiddlewareOptions {
@@ -40,14 +41,40 @@ interface CmssyPageResult {
     enabledLocales: string[];
     /** True for a verified editor request. The edit route renders the bridge. */
     isEdit: boolean;
+    /**
+     * Edit mode only, and only when `blocks` was passed: what the canvas needs,
+     * **keyed by position**. The header and the footer hold different blocks, so
+     * they resolve to different data - handing the footer the header's is the
+     * quiet version of this bug.
+     *
+     * Without `resolvedContent` a relation field shows the raw ids it stores,
+     * which is what this adapter did until now.
+     */
+    editorData?: Record<string, CmssyLayoutEditorData>;
+    editorOrigin?: string | string[];
+}
+interface CmssyLayoutEditorData {
+    data: Record<string, unknown>;
+    resolvedContent: Record<string, Record<string, unknown>>;
+}
+interface LoadCmssyPageOptions {
+    /**
+     * The block registry. Required to resolve the editor's layout data; omit it
+     * and the layouts still render, but the editor cannot fill them.
+     */
+    blocks?: BlockDefinition[];
+    /** Which positions the editor renders. Defaults to the header and footer. */
+    positions?: string[];
+    appContext?: Record<string, unknown>;
 }
 /**
- * Everything a cmssy page needs, from a plain Request. No framework globals: the
- * locale comes from the header the middleware set (falling back to the path, so
- * a prerendered page still knows its language), and the editor flag comes from
- * the same signal the Next adapter uses - because it is the same protocol, not
- * a Next protocol.
+ * Everything a cmssy page needs, from a plain Request. No framework globals.
+ *
+ * The layout half is `resolveCmssyLayoutSlot` from `@cmssy/react` - the same
+ * function the Next adapter uses, so the preview secret, the language and the
+ * editor data are decided in one place for all three frameworks rather than
+ * three times with two of them wrong.
  */
-declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL): Promise<CmssyPageResult>;
+declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL, options?: LoadCmssyPageOptions): Promise<CmssyPageResult>;
 
 export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, cmssyMiddleware, loadCmssyPage };

package/dist/index.js

@@ -1,6 +1,7 @@
 import { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, isVerifiedEditUrl, applyCmssyCsp, CMSSY_SECRET_QUERY_PARAM } from '@cmssy/core';
 export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
-import { CMSSY_LOCALE_HEADER, localeForPathname, isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, fetchLayouts } from '@cmssy/core/internal';
+import { CMSSY_LOCALE_HEADER, localeForPathname, isDevelopment, resolveSiteLocales, fetchPage } from '@cmssy/core/internal';
+import { resolveCmssyLayoutSlot } from '@cmssy/react';
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -46,25 +47,57 @@ function cmssyMiddleware(config, options = {}) {
     return next();
   };
 }
-async function loadCmssyPage(config, request, url) {
+async function loadCmssyPage(config, request, url, options = {}) {
   const isEdit = request.headers.get(CMSSY_EDIT_HEADER) === "1";
-  const siteLocales = await resolveSiteLocales(config);
   const segments = url.pathname.replace(/^\/cmssy-edit/, "").split("/").filter(Boolean);
-  const fromPath = splitLocaleFromPath(segments, siteLocales);
-  const locale = request.headers.get(CMSSY_LOCALE_HEADER) ?? fromPath.locale;
-  const path = fromPath.path;
-  const previewSecret = isEdit ? config.draftSecret : void 0;
-  const [page, layouts] = await Promise.all([
-    fetchPage(config, path, { previewSecret }),
-    fetchLayouts(config, path, { previewSecret })
-  ]);
+  const positions = options.positions ?? ["header", "footer"];
+  const blocks = options.blocks ?? [];
+  const headerLocale = request.headers.get(CMSSY_LOCALE_HEADER) ?? void 0;
+  const slot = await resolveCmssyLayoutSlot(config, {
+    position: positions[0] ?? "header",
+    blocks,
+    editMode: isEdit,
+    path: segments,
+    locale: headerLocale,
+    appContext: options.appContext
+  });
+  const page = await fetchPage(config, slot.path, {
+    previewSecret: isEdit ? config.draftSecret : void 0
+  });
+  let editorData;
+  if (isEdit && slot.data && slot.resolvedContent) {
+    editorData = {
+      [positions[0] ?? "header"]: {
+        data: slot.data,
+        resolvedContent: slot.resolvedContent
+      }
+    };
+    for (const position of positions.slice(1)) {
+      const extra = await resolveCmssyLayoutSlot(config, {
+        position,
+        blocks,
+        editMode: true,
+        path: segments,
+        locale: headerLocale,
+        appContext: options.appContext
+      });
+      if (extra.data && extra.resolvedContent) {
+        editorData[position] = {
+          data: extra.data,
+          resolvedContent: extra.resolvedContent
+        };
+      }
+    }
+  }
   return {
     page,
-    layouts,
-    locale,
-    defaultLocale: siteLocales.defaultLocale,
-    enabledLocales: siteLocales.locales,
-    isEdit
+    layouts: slot.groups,
+    locale: slot.locale,
+    defaultLocale: slot.defaultLocale,
+    enabledLocales: slot.enabledLocales,
+    isEdit,
+    editorData,
+    editorOrigin: slot.editorOrigin
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/astro",
-  "version": "10.10.0",
+  "version": "11.1.0",
   "description": "Astro bindings for cmssy headless sites: middleware, page loader, sitemap and robots.",
   "keywords": [
     "cmssy",
@@ -39,16 +39,18 @@
     "dist"
   ],
   "peerDependencies": {
-    "astro": ">=4"
+    "astro": ">=4",
+    "@cmssy/react": "^11.1.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
-    "vitest": "^2.1.0"
+    "vitest": "^2.1.0",
+    "@cmssy/react": "11.1.0"
   },
   "dependencies": {
-    "@cmssy/core": "10.10.0"
+    "@cmssy/core": "11.1.0"
   },
   "scripts": {
     "build": "tsup",