@orion-studios/payload-studio 0.5.0-beta.7 → 0.5.0-beta.71

package/dist/blocks/index.mjs

@@ -17,8 +17,8 @@ import {
   defaultPageLayoutBlocks,
   sectionPresets,
   templateStarterPresets
-} from "../chunk-PC5622T7.mjs";
-import "../chunk-ETRRXURT.mjs";
+} from "../chunk-XK3K5GRP.mjs";
+import "../chunk-SIL2J5MF.mjs";
 import "../chunk-6BWS3CLP.mjs";
 export {
   BeforeAfterBlock,

package/dist/{chunk-ZLLNO5FM.mjs → chunk-6H4JTVPY.mjs}

@@ -1,3 +1,9 @@
+import {
+  assertStudioDocumentV1
+} from "./chunk-HXGAG6I7.mjs";
+import {
+  studioDocumentToLayout
+} from "./chunk-C6VEFZVY.mjs";
 import {
   __export
 } from "./chunk-6BWS3CLP.mjs";
@@ -27,6 +33,24 @@ function createPayloadClient(config) {
 
 // src/nextjs/queries/pages.ts
 import { unstable_cache } from "next/cache";
+var PAGE_QUERY_CACHE_VERSION = "v4-published-only-public";
+function withStudioDocumentLayout(page) {
+  if (!page) {
+    return null;
+  }
+  try {
+    const studioDocument = assertStudioDocumentV1(page.studioDocument);
+    const compiledLayout = studioDocumentToLayout(studioDocument);
+    if (Array.isArray(compiledLayout) && compiledLayout.length > 0) {
+      return {
+        ...page,
+        layout: compiledLayout
+      };
+    }
+  } catch {
+  }
+  return page;
+}
 function normalizePath(segments) {
   if (!segments || segments.length === 0) {
     return "/";
@@ -35,35 +59,42 @@ function normalizePath(segments) {
   return cleaned.length > 0 ? `/${cleaned}` : "/";
 }
 async function queryPageByPath(payload, path, draft) {
+  const pathWhere = {
+    path: {
+      equals: path
+    }
+  };
+  const publishedWhere = {
+    _status: {
+      equals: "published"
+    }
+  };
   const result = await payload.find({
     collection: "pages",
     depth: 2,
     draft,
     limit: 1,
     overrideAccess: false,
-    where: {
-      path: {
-        equals: path
-      }
-    }
+    where: draft ? pathWhere : { and: [pathWhere, publishedWhere] }
   });
   if (result.docs.length > 0) {
-    return result.docs[0] || null;
+    return withStudioDocumentLayout(result.docs[0] || null);
   }
   if (path === "/") {
+    const homeWhere = {
+      slug: {
+        equals: "home"
+      }
+    };
     const homeResult = await payload.find({
       collection: "pages",
       depth: 2,
       draft,
       limit: 1,
       overrideAccess: false,
-      where: {
-        slug: {
-          equals: "home"
-        }
-      }
+      where: draft ? homeWhere : { and: [homeWhere, publishedWhere] }
     });
-    return homeResult.docs[0] || null;
+    return withStudioDocumentLayout(homeResult.docs[0] || null);
   }
   return null;
 }
@@ -73,7 +104,7 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
       const payload = await getPayloadClient();
       return queryPageByPath(payload, path, false);
     },
-    ["page-by-path"],
+    ["page-by-path", PAGE_QUERY_CACHE_VERSION],
     { tags: [contentTag] }
   );
   async function getPageBySegments(segments, draft = false) {