bsmnt 0.13.1 → 0.15.0

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/page-builder-config.ts

@@ -1,5 +1,4 @@
 import { contentIcon, pageIcon, type SanityStudioIcon } from "./icons";
-import { singletonComponents } from "./singletons";
 
 export type PageBuilderDocumentType =
 	| "hero"
@@ -7,7 +6,7 @@ export type PageBuilderDocumentType =
 	| "richTextBlock"
 	| "gatedContent"
 	| "blogContent"
-	| (typeof singletonComponents)[number]["schemaType"];
+	| "blogCollection";
 
 /**
  * A block declares two orthogonal axes. `pageTypes` is which page documents may
@@ -27,18 +26,16 @@ export const componentCategories = [
 
 export type ComponentCategory = (typeof componentCategories)[number]["name"];
 
-type PageBuilderReferenceMember = {
+type PageBuilderBlockMember = {
 	documentType: PageBuilderDocumentType;
-	name: string;
 	title: string;
-	documentId?: string;
 	pageTypes: readonly PageBuilderGroupName[];
 	category: ComponentCategory;
+	// Renders the page's H1, which replaces the title heading the page would
+	// otherwise render.
+	rendersPageHeading?: true;
 };
 
-export const blockPreviewKey = (schemaTypeName: string) =>
-	`block.${schemaTypeName}`;
-
 export const pageBuilderPageTypes: Array<{
 	title: string;
 	value: PageBuilderGroupName;
@@ -56,78 +53,62 @@ export const getPageCategoryIcon = (
 	pageType: PageBuilderGroupName | undefined | null,
 ) => pageCategoryIcons[pageType ?? "generic"];
 
-const reusablePageBuilderReferenceMembers: PageBuilderReferenceMember[] = [
+export const pageBuilderBlockMembers: PageBuilderBlockMember[] = [
 	{
 		documentType: "hero",
-		name: "heroReference",
 		title: "Heading",
 		pageTypes: ["generic"],
 		category: "hero",
+		rendersPageHeading: true,
 	},
 	{
 		documentType: "description",
-		name: "descriptionReference",
 		title: "Description",
 		pageTypes: ["generic"],
 		category: "text",
 	},
 	{
 		documentType: "richTextBlock",
-		name: "richTextBlockReference",
 		title: "Rich Text",
 		pageTypes: ["generic"],
 		category: "text",
 	},
 	{
 		documentType: "gatedContent",
-		name: "gatedContentReference",
 		title: "Gated Content",
 		pageTypes: ["generic"],
 		category: "misc",
 	},
+	{
+		documentType: "blogCollection",
+		title: "Blog Collection",
+		pageTypes: ["generic"],
+		category: "list",
+	},
 	{
 		documentType: "blogContent",
-		name: "blogContentReference",
 		title: "Blog Posts",
 		pageTypes: ["blogEntry"],
 		category: "content",
 	},
 ];
 
-const singletonPageBuilderReferenceMembers: PageBuilderReferenceMember[] =
-	singletonComponents.map((component) => ({
-		documentType: component.schemaType,
-		name: `${component.schemaType}Reference`,
-		title: component.title,
-		documentId: component.documentId,
-		pageTypes: ["generic"],
-		category: component.category,
-	}));
-
-export const pageBuilderReferenceMembers: PageBuilderReferenceMember[] = [
-	...reusablePageBuilderReferenceMembers,
-	...singletonPageBuilderReferenceMembers,
-];
-
-export const getPageBuilderReferenceMember = (name: string) =>
-	pageBuilderReferenceMembers.find((member) => member.name === name);
-
-export const getPageBuilderReferenceMemberByDocumentType = (
+export const getPageBuilderBlockMember = (
 	documentType: PageBuilderDocumentType,
 ) =>
-	pageBuilderReferenceMembers.find(
+	pageBuilderBlockMembers.find(
 		(member) => member.documentType === documentType,
 	);
 
 const isMemberVisibleForPageType = (
-	member: PageBuilderReferenceMember,
+	member: PageBuilderBlockMember,
 	pageType: PageBuilderGroupName | undefined,
 ) => member.pageTypes.includes(pageType ?? "generic");
 
-export const getVisiblePageBuilderReferenceMembers = (
+export const getVisiblePageBuilderBlockMembers = (
 	pageType: PageBuilderGroupName | undefined,
 ) =>
-	pageBuilderReferenceMembers.filter((member) =>
+	pageBuilderBlockMembers.filter((member) =>
 		isMemberVisibleForPageType(member, pageType),
 	);
 
@@ -135,7 +116,9 @@ export const getVisiblePageBuilderMemberNames = (
 	pageType: PageBuilderGroupName | undefined,
 ) =>
 	new Set(
-		getVisiblePageBuilderReferenceMembers(pageType).map((member) => member.name),
+		getVisiblePageBuilderBlockMembers(pageType).map(
+			(member) => member.documentType,
+		),
 	);
 
 export const getVisiblePageBuilderInsertMenuGroups = (
@@ -155,28 +138,32 @@ export const getInvalidPageBuilderDocumentTypes = (
 	documentTypes: PageBuilderDocumentType[],
 ) =>
 	documentTypes.filter((documentType) => {
-		const member = getPageBuilderReferenceMemberByDocumentType(documentType);
+		const member = getPageBuilderBlockMember(documentType);
 
 		if (!member) return false;
 
 		return !isMemberVisibleForPageType(member, pageType);
 	});
 
+export const countPageHeadingBlocks = (
+	blocks: ReadonlyArray<{ _key?: string; _type?: string }>,
+	hiddenKeys: readonly string[] = [],
+) =>
+	blocks.filter(
+		(block) =>
+			!(block._key && hiddenKeys.includes(block._key)) &&
+			getPageBuilderBlockMember(block._type as PageBuilderDocumentType)
+				?.rendersPageHeading,
+	).length;
+
 export const pageBuilderInsertMenuGroups: Array<{
 	name: ComponentCategory;
 	title: string;
-	of: string[];
+	of: PageBuilderDocumentType[];
 }> = componentCategories.map(({ name, title }) => ({
 	name,
 	title,
-	of: pageBuilderReferenceMembers
+	of: pageBuilderBlockMembers
 		.filter((member) => member.category === name)
-		.map((member) => member.name),
+		.map((member) => member.documentType),
 }));
-
-export const pageBuilderBlockPreviewOptions = pageBuilderReferenceMembers.map(
-	(member) => ({
-		title: `Block — ${member.title} · ${member.name}`,
-		value: blockPreviewKey(member.name),
-	}),
-);

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/presentation.ts

@@ -7,7 +7,6 @@ import {
 	presentationTool,
 } from "sanity/presentation";
 import { previewURL } from "./env";
-import { pageBuilderReferenceMembers } from "./page-builder-config";
 import { getPinnedPageById, HOMEPAGE_PINNED_PAGE } from "./pinned-pages";
 
 const MAX_FOLDER_DEPTH = 6;
@@ -44,52 +43,6 @@ const pageResolvedSlugExpression = buildNestedSlugExpression(
 	"slug.current",
 );
 
-const PAGE_BUILDER_DOCUMENT_TYPES = new Set<string>(
-	pageBuilderReferenceMembers.map((member) => member.documentType),
-);
-
-const HOST_PAGES_QUERY = `*[_type == "page" && references($id)]{
-  _id,
-  title,
-  "resolvedSlug": ${pageResolvedSlugExpression}
-}`;
-
-type HostPage = {
-	_id: string;
-	title?: string;
-	resolvedSlug?: string;
-};
-
-const isDraftId = (id: string) => id.startsWith("drafts.");
-
-const resolveHostPageLocations = (
-	documentStore: DocumentStore,
-	id: string,
-): Observable<DocumentLocationsState> =>
-	documentStore.listenQuery(HOST_PAGES_QUERY, { id }, {}).pipe(
-		map((pages: HostPage[] | null) => {
-			const deduped = new Map<string, HostPage>();
-			for (const page of pages ?? []) {
-				const publishedId = page._id.replace(/^drafts\./, "");
-				const existing = deduped.get(publishedId);
-				if (!existing || isDraftId(existing._id)) {
-					deduped.set(publishedId, page);
-				}
-			}
-
-			return {
-				locations: [...deduped.values()].flatMap((page) => {
-					const pinned = getPinnedPageById(page._id);
-					const href =
-						pinned?.path ??
-						(page.resolvedSlug ? `/${page.resolvedSlug}` : null);
-					if (!href) return [];
-					return [{ title: page.title || pinned?.title || "Page", href }];
-				}),
-			};
-		}),
-	);
-
 const resolveSlugLocation = <T extends { title?: string }>(
 	documentStore: DocumentStore,
 	id: string,
@@ -136,9 +89,7 @@ export const presentation = presentationTool({
 				);
 			}
 
-			if (!PAGE_BUILDER_DOCUMENT_TYPES.has(params.type)) return null;
-
-			return resolveHostPageLocations(documentStore, params.id);
+			return null;
 		},
 	},
 	previewUrl: {

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/queries.ts

@@ -88,58 +88,53 @@ const richTextLinkProjection = `
 const pageBuilderProjection = `
   pageBuilder[!(_key in coalesce(^.hiddenPageBuilderKeys, []))]{
     _key,
-    ...@->{
-      // Gated content withholds its payload from the page query — only the
-      // teaser and gate config ship to the client. GROQ has no field exclusion,
-      // so this branch lists safe fields explicitly rather than spreading every
-      // field. The payload is fetched separately via GATED_CONTENT_QUERY.
-      _type == "gatedContent" => {
-        _id,
-        _type,
-        anchorId,
-        presentation,
-        internalTitle,
-        teaserHeading,
-        teaserBody[]{
+    // Gated content withholds its payload from the page query — only the
+    // teaser and gate config ship to the client. GROQ has no field exclusion,
+    // so this branch lists safe fields explicitly rather than spreading every
+    // field. The payload is fetched separately via GATED_CONTENT_QUERY.
+    _type == "gatedContent" => {
+      _type,
+      anchorId,
+      presentation,
+      internalTitle,
+      teaserHeading,
+      teaserBody[]{
+        ${richTextLinkProjection}
+      },
+      gateType,
+      gateHeadline,
+      gateDescription,
+      submitLabel,
+      successMessage,
+      kind
+    },
+    _type != "gatedContent" => {
+      ...,
+      _type == "richTextBlock" => {
+        content[]{
           ${richTextLinkProjection}
-        },
-        gateType,
-        gateHeadline,
-        gateDescription,
-        submitLabel,
-        successMessage,
-        kind
+        }
       },
-      _type != "gatedContent" => {
-        ...,
-        _type == "richTextBlock" => {
-          ...,
-          content[]{
-            ${richTextLinkProjection}
-          }
+      _type == "blogContent" => {
+        categories[]->{
+          _id,
+          title,
+          slug
+        },
+        author->{
+          _id,
+          name,
+          avatar,
+          role
+        },
+        body[]{
+          ${richTextLinkProjection}
         },
-        _type == "blogContent" => {
-          ...,
-          categories[]->{
-            _id,
-            title,
-            slug
-          },
-          author->{
-            _id,
-            name,
-            avatar,
-            role
-          },
-          body[]{
-            ${richTextLinkProjection}
-          },
-          relatedPosts[]->{
-            _id,
-            title,
-            "resolvedSlug": ${pageResolvedSlugExpression},
-            metadata
-          }
+        relatedPosts[]->{
+          _id,
+          title,
+          "resolvedSlug": ${pageResolvedSlugExpression},
+          metadata
         }
       }
     }
@@ -147,10 +142,13 @@ const pageBuilderProjection = `
 `;
 
 // Gated content payload — fetched on demand by the unlock server action, keyed
-// by the block's document id. Kept out of the page query so it never ships to
-// the client until the visitor completes the gate.
+// by the hosting page plus the block's `_key`. Kept out of the page query so it
+// never ships to the client until the visitor completes the gate.
 export const GATED_CONTENT_QUERY = defineQuery(`
-  *[_type == "gatedContent" && _id == $id][0]{
+  *[
+    _type == "page" &&
+    (_id == $pageId || _id == "drafts." + $pageId)
+  ][0].pageBuilder[_key == $blockKey && _type == "gatedContent"][0]{
     kind,
     content[]{
       ${richTextLinkProjection}
@@ -231,16 +229,10 @@ export const P_REV_SLUGS_QUERY = defineQuery(`
   }
 `);
 
-// Pages depending on `$documentIds`, one or two hops out: one covers
-// `collectionCategory->`, two covers anything reached through a page-builder
-// block. All inline the referenced title or slug, so a change there goes stale.
 export const P_REF_DOC_PAGES_QUERY = defineQuery(`
   *[
     _type == "page" &&
-    (
-      references($documentIds) ||
-      count(pageBuilder[_ref in *[references($documentIds)]._id]) > 0
-    )
+    references($documentIds)
   ] | order(title asc) {
     _id,
     title,
@@ -285,6 +277,25 @@ export const P_REV_FOLDER_DESCENDANTS_QUERY = defineQuery(`
   }
 `);
 
+// Path and labels of the homepage and the pages at `$paths`, for naming
+// breadcrumbs. `folderTitle` is only set on a folder's index page.
+export const BREADCRUMB_PAGES_QUERY = defineQuery(`
+  *[
+    _type == "page" &&
+    (
+      (!defined(pageFolder._ref) && (!defined(slug.current) || slug.current == "" || slug.current == "/")) ||
+      ${pageResolvedSlugExpression} in $paths
+    )
+  ]{
+    "path": ${pageResolvedSlugExpression},
+    title,
+    shortTitle,
+    "folderTitle": select(
+      defined(pageFolder) && (!defined(slug.current) || slug.current == "" || slug.current == "/") => pageFolder->title
+    )
+  }
+`);
+
 export const PAGE_SITEMAP_QUERY = defineQuery(`
   *[
     _type == "page" &&
@@ -319,7 +330,7 @@ export const ALL_BLOG_ARTICLES_QUERY = defineQuery(`
     title,
     "slug": slug,
     "resolvedSlug": ${pageResolvedSlugExpression},
-    "blogContent": pageBuilder[_ref in *[_type == "blogContent"]._id][0]->{
+    "blogContent": pageBuilder[_type == "blogContent"][0]{
       thumbnail{
         ...,
         alt
@@ -356,14 +367,14 @@ export const BLOG_ARTICLES_PAGINATED_QUERY = defineQuery(`
     (
       !defined($category) ||
       $category == "" ||
-      $category in pageBuilder[_ref in *[_type == "blogContent"]._id][0]->categories[]->slug.current
+      $category in pageBuilder[_type == "blogContent"][0].categories[]->slug.current
     )
   ] | order(_updatedAt desc)[$offset...$end] {
     _id,
     title,
     "slug": slug,
     "resolvedSlug": ${pageResolvedSlugExpression},
-    "blogContent": pageBuilder[_ref in *[_type == "blogContent"]._id][0]->{
+    "blogContent": pageBuilder[_type == "blogContent"][0]{
       thumbnail{
         ...,
         alt
@@ -395,7 +406,7 @@ export const BLOG_ARTICLES_COUNT_QUERY = defineQuery(`
     (
       !defined($category) ||
       $category == "" ||
-      $category in pageBuilder[_ref in *[_type == "blogContent"]._id][0]->categories[]->slug.current
+      $category in pageBuilder[_type == "blogContent"][0].categories[]->slug.current
     )
   ])
 `);
@@ -415,7 +426,7 @@ export const ALL_BLOG_CATEGORIES_QUERY = defineQuery(`
 export const COLLECTION_PAGES_QUERY = defineQuery(`
   *[
     _type == "page" &&
-    count(pageBuilder[!(_key in coalesce(^.hiddenPageBuilderKeys, [])) && _ref in *[_type == "blogCollection"]._id]) > 0
+    count(pageBuilder[!(_key in coalesce(^.hiddenPageBuilderKeys, [])) && _type == "blogCollection"]) > 0
   ] {
     "path": ${pageResolvedSlugExpression},
     "category": collectionCategory->slug.current
@@ -509,6 +520,7 @@ const structuredDataProjection = `
   description,
   url,
   "logo": logo.asset->url,
+  shareImage{ asset, hotspot, crop },
   contactPoint,
   address,
   "sameAs": array::unique(array::compact(