bsmnt 0.13.0 → 0.14.0

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

@@ -43,10 +43,6 @@ const pageResolvedSlugExpression = buildNestedSlugExpression(
 	"slug.current",
 );
 
-const CONTENT_TYPE_PREFIXES: Record<string, string> = {
-	blogContent: "blog",
-};
-
 const resolveSlugLocation = <T extends { title?: string }>(
 	documentStore: DocumentStore,
 	id: string,
@@ -73,10 +69,6 @@ export const presentation = presentationTool({
 				route: "/",
 				filter: `_type == "page" && _id == "${HOMEPAGE_PINNED_PAGE.id}"`,
 			},
-			...Object.entries(CONTENT_TYPE_PREFIXES).map(([type, prefix]) => ({
-				route: `/${prefix}/:slug`,
-				filter: `_type == "${type}" && slug.current == $slug`,
-			})),
 			{
 				route: "/:slug+",
 				filter: `_type == "page" && ${pageResolvedSlugExpression} == $slug`,
@@ -97,16 +89,7 @@ export const presentation = presentationTool({
 				);
 			}
 
-			const prefix = CONTENT_TYPE_PREFIXES[params.type];
-			if (!prefix) return null;
-
-			return resolveSlugLocation<{ title?: string; slug?: string }>(
-				documentStore,
-				params.id,
-				`title, "slug": slug.current`,
-				(doc) => (doc.slug ? `/${prefix}/${doc.slug}` : null),
-				"Untitled",
-			);
+			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
         },
-        _type == "blogContent" => {
-          ...,
-          categories[]->{
-            _id,
-            title,
-            slug
-          },
-          author->{
-            _id,
-            name,
-            avatar,
-            role
-          },
-          body[]{
-            ${richTextLinkProjection}
-          },
-          relatedPosts[]->{
-            _id,
-            title,
-            "resolvedSlug": ${pageResolvedSlugExpression},
-            metadata
-          }
+        author->{
+          _id,
+          name,
+          avatar,
+          role
+        },
+        body[]{
+          ${richTextLinkProjection}
+        },
+        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,
@@ -319,7 +311,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 +348,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 +387,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 +407,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

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

@@ -7,7 +7,6 @@ import { dataset, projectId } from "./env";
 import { PINNED_PAGE_ENTRIES, PINNED_PAGE_IDS } from "./pinned-pages";
 import { presentation } from "./presentation";
 import { schema } from "./schemas";
-import { singletonComponentTypes } from "./singletons";
 import { structure } from "./structure";
 
 const isProd = process.env.NODE_ENV === "production";
@@ -19,10 +18,9 @@ const singletonDocumentActions = new Set([
 ]);
 
 const isSingletonDocument = (schemaType: string, documentId?: string) =>
-	singletonComponentTypes.has(schemaType) ||
-	(schemaType === "page" &&
-		documentId !== undefined &&
-		PINNED_PAGE_IDS.has(documentId));
+	schemaType === "page" &&
+	documentId !== undefined &&
+	PINNED_PAGE_IDS.has(documentId);
 
 export default defineConfig({
 	basePath: "/studio",
@@ -107,9 +105,7 @@ export default defineConfig({
 		},
 		newDocumentOptions: (previousOptions) =>
 			previousOptions.filter(
-				(option) =>
-					!singletonComponentTypes.has(option.templateId) &&
-					!PINNED_PAGE_IDS.has(option.templateId),
+				(option) => !PINNED_PAGE_IDS.has(option.templateId),
 			),
 	},
 	plugins: [structureTool({ structure }), presentation, media(), table()],

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/schemas/components/index.ts

@@ -4,4 +4,3 @@ export { gatedContent } from "./reusable/gated-content";
 export { hero } from "./reusable/hero";
 export { richTextBlock } from "./reusable/rich-text-block";
 export { blogCollection } from "./singleton/content-collection";
-export { studioPreview } from "./studio-preview";

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/schemas/components/reusable/blog-content.ts

@@ -4,7 +4,7 @@ import { defineBlock } from "@/lib/integrations/sanity/schemas/shared/block";
 
 export const blogContent = defineBlock({
 	name: "blogContent",
-	title: "Blog Content",
+	title: "Blog Posts",
 	icon: contentIcon,
 	fields: [
 		defineField({
@@ -80,7 +80,7 @@ export const blogContent = defineBlock({
 		},
 		prepare({ title, date, media }) {
 			return {
-				title: title || "Blog Content",
+				title: title || "Blog Posts",
 				subtitle: date || "No date set",
 				media,
 			};

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

@@ -15,7 +15,6 @@ import {
 	gatedContent,
 	hero,
 	richTextBlock,
-	studioPreview,
 } from "./components";
 import { author } from "./content/author";
 import { blogCategory } from "./content/blog-category";
@@ -83,7 +82,6 @@ export {
 	spacingSettings,
 	spacingStep,
 	structuredData,
-	studioPreview,
 	videoJsonLd,
 };
 
@@ -121,8 +119,7 @@ export const schema: { types: SchemaTypeDefinition[] } = {
 		description,
 		richTextBlock,
 		gatedContent,
-		studioPreview,
-
+	
 		// Layout types (singletons for site-wide layout)
 		companyData,
 		navbar,

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/integrations/sanity/schemas/shared/block.ts

@@ -1,8 +1,8 @@
 import {
-	type DocumentDefinition,
 	defineType,
 	type FieldDefinition,
 	type FieldGroupDefinition,
+	type ObjectDefinition,
 } from "sanity";
 import { presentationFields } from "./presentation";
 
@@ -11,7 +11,7 @@ const presentationGroup: FieldGroupDefinition = {
 	title: "Presentation",
 };
 
-type BlockDefinition = Omit<DocumentDefinition, "type" | "fields" | "groups"> & {
+type BlockDefinition = Omit<ObjectDefinition, "type" | "fields" | "groups"> & {
 	fields: FieldDefinition[];
 	groups?: FieldGroupDefinition[];
 };
@@ -26,7 +26,7 @@ const withPresentationGroup = (groups: FieldGroupDefinition[] | undefined) => {
 };
 
 /**
- * Defines a page-builder block — `type: "document"` plus Anchor ID and
+ * Defines a page-builder block — an inline `type: "object"` plus Anchor ID and
  * Presentation Mode. Use instead of `defineType`.
  */
 export const defineBlock = ({ fields, groups, ...rest }: BlockDefinition) => {
@@ -34,7 +34,7 @@ export const defineBlock = ({ fields, groups, ...rest }: BlockDefinition) => {
 
 	return defineType({
 		...rest,
-		type: "document",
+		type: "object",
 		...(blockGroups ? { groups: blockGroups } : {}),
 		fields: [
 			...fields,

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

@@ -2,8 +2,8 @@ import { defineArrayMember, defineType } from "sanity";
 import { BlockActionsItem } from "@/lib/integrations/sanity/components/block-actions-item";
 import { PageBuilderInput } from "@/lib/integrations/sanity/components/page-builder-input";
 import {
+	pageBuilderBlockMembers,
 	pageBuilderInsertMenuGroups,
-	pageBuilderReferenceMembers,
 } from "@/lib/integrations/sanity/page-builder-config";
 
 export const pageBuilder = defineType({
@@ -17,27 +17,13 @@ export const pageBuilder = defineType({
 			groups: pageBuilderInsertMenuGroups,
 		},
 	},
-	of: pageBuilderReferenceMembers.map((member) =>
+	of: pageBuilderBlockMembers.map((member) =>
 		defineArrayMember({
-			name: member.name,
+			type: member.documentType,
 			title: member.title,
-			type: "reference",
-			to: [{ type: member.documentType }],
 			// Per-placement Hide/Show action; hidden state lives in the owning
-			// document's `hiddenPageBuilderKeys`, not on the ref itself.
+			// document's `hiddenPageBuilderKeys`, not on the block itself.
 			components: { item: BlockActionsItem },
-			...(member.documentId
-				? {
-						options: {
-							disableNew: true,
-							filter: "_id in [$documentId, $draftDocumentId]",
-							filterParams: {
-								documentId: member.documentId,
-								draftDocumentId: `drafts.${member.documentId}`,
-							},
-						},
-					}
-				: {}),
 		}),
 	),
 });

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

@@ -5,7 +5,7 @@ import { apiVersion } from "@/lib/integrations/sanity/env";
 import { pageIcon } from "@/lib/integrations/sanity/icons";
 import {
 	getInvalidPageBuilderDocumentTypes,
-	getPageBuilderReferenceMemberByDocumentType,
+	getPageBuilderBlockMember,
 	getPageCategoryIcon,
 	type PageBuilderDocumentType,
 	type PageBuilderGroupName,
@@ -24,7 +24,6 @@ type PageValidationDocument = {
 	pageBuilder?: Array<{
 		_key?: string;
 		_type?: string;
-		_ref?: string;
 	}>;
 };
 
@@ -35,11 +34,6 @@ type PageSlugValidationContext = {
 	};
 };
 
-type ReferencedPageBuilderDocument = {
-	_id: string;
-	_type: PageBuilderDocumentType;
-};
-
 const PAGE_FOLDER_QUERY = `*[_type == "pageFolder" && _id in [$publishedId, $draftId]][0].slug.current`;
 
 async function getGeneratedPageCategoryForDocument(
@@ -164,41 +158,25 @@ export const page = defineType({
 						document,
 						context.getClient,
 					);
-					const pageBuilderItems = Array.isArray(value)
-						? (value as Array<{ _ref?: string }>)
-						: [];
-					const referenceIds = pageBuilderItems
-						.map((item) => item?._ref?.replace(/^drafts\./, ""))
-						.filter((item): item is string => typeof item === "string");
-
-					if (referenceIds.length === 0) return true;
-
-					const referencedDocuments = await context
-						.getClient({ apiVersion })
-						.fetch<ReferencedPageBuilderDocument[]>(
-							`*[
-                _id in $publishedIds || _id in $draftIds
-              ]{
-                _id,
-                _type
-              }`,
-							{
-								publishedIds: referenceIds,
-								draftIds: referenceIds.map((id) => `drafts.${id}`),
-							},
+					const documentTypes = (Array.isArray(value) ? value : [])
+						.map((item) => (item as { _type?: string })?._type)
+						.filter(
+							(type): type is PageBuilderDocumentType =>
+								typeof type === "string",
 						);
 
+					if (documentTypes.length === 0) return true;
+
 					const invalidDocumentTypes = getInvalidPageBuilderDocumentTypes(
 						pageType,
-						referencedDocuments.map((entry) => entry._type),
+						documentTypes,
 					);
 
 					if (invalidDocumentTypes.length === 0) return true;
 
-					const invalidMemberTitles = invalidDocumentTypes.map(
+					const invalidMemberTitles = [...new Set(invalidDocumentTypes)].map(
 						(documentType) =>
-							getPageBuilderReferenceMemberByDocumentType(documentType)
-								?.title ?? documentType,
+							getPageBuilderBlockMember(documentType)?.title ?? documentType,
 					);
 
 					return `These page builder components do not belong to the "${pageType ?? "generic"}" category: ${invalidMemberTitles.join(", ")}`;
@@ -209,10 +187,6 @@ export const page = defineType({
 			title: "Pinned Collection Category",
 			type: "reference",
 			to: [{ type: "blogCategory" }],
-			// Lives on the page because the collection block is deliberately a
-			// singleton (see `singletonComponents`) — editors reuse one block rather
-			// than creating them, so a category set there would apply site-wide. Move
-			// the block to the reusable list if you'd rather scope it per instance.
 			description:
 				"Turns this page into a category page: the content collection shows only this category. Leave empty to show everything.",
 		}),

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

@@ -2,22 +2,10 @@ import {
 	companyDataIcon,
 	footerIcon,
 	navbarIcon,
-	pageListIcon,
 	spacingSettingsIcon,
 	structuredDataIcon,
 } from "./icons";
 
-// `category` must be one of `componentCategories` in page-builder-config.ts.
-export const singletonComponents = [
-	{
-		schemaType: "blogCollection",
-		documentId: "blogCollection",
-		title: "Blog Collection",
-		icon: pageListIcon,
-		category: "list",
-	},
-] as const;
-
 export const singletonLayout = [
 	{
 		schemaType: "companyData",
@@ -51,10 +39,6 @@ export const singletonLayout = [
 	},
 ] as const;
 
-export const singletonComponentTypes: Set<string> = new Set(
-	singletonComponents.map((item) => item.schemaType),
-);
-
 export const singletonLayoutTypes: Set<string> = new Set(
 	singletonLayout.map((item) => item.schemaType),
 );

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

@@ -6,18 +6,20 @@ import type {
 	StructureResolver,
 	StructureResolverContext,
 } from "sanity/structure";
+import {
+	COMPONENT_LIBRARY,
+	getComponentPreviewPath,
+} from "@/components/page-builder/library";
+import { pageBuilderInsertMenuGroups } from "@/lib/integrations/sanity/page-builder-config";
+import { ComponentPreviewPane } from "./components/component-preview-pane";
 import { apiVersion } from "./env";
 import {
 	authorIcon,
 	blogCategoryIcon,
+	componentIcon,
 	componentsFolderIcon,
 	contentFolderIcon,
-	contentIcon,
-	descriptionIcon,
-	gatedContentIcon,
-	heroIcon,
 	layoutFolderIcon,
-	pageBuilderCardIcon,
 	pageFolderIcon,
 	pageIcon,
 	pagesFolderIcon,
@@ -25,7 +27,7 @@ import {
 } from "./icons";
 import { PageTreePane } from "./page-tree-pane";
 import { PINNED_PAGE_ENTRIES } from "./pinned-pages";
-import { singletonComponents, singletonLayout } from "./singletons";
+import { singletonLayout } from "./singletons";
 
 const PAGE_TREE_ITEM_ID_PREFIX = {
 	page: "page-tree-",
@@ -271,7 +273,7 @@ export const structure: StructureResolver = (S, context) =>
 
 			S.divider(),
 
-			// GROUP 3: Components -- singleton and reusable components
+			// GROUP 3: Components -- live block previews, grouped like the insert menu
 			S.listItem()
 				.title("Components")
 				.icon(componentsFolderIcon)
@@ -279,33 +281,33 @@ export const structure: StructureResolver = (S, context) =>
 					S.list()
 						.title("Components")
 						.items([
-							S.divider().title("Singleton Components"),
-							...singletonComponents.map((item) =>
-								S.listItem()
-									.title(item.title)
-									.id(item.documentId)
-									.icon(item.icon)
-									.child(
-										S.document()
-											.schemaType(item.schemaType)
-											.documentId(item.documentId),
+							...pageBuilderInsertMenuGroups.flatMap((group) => {
+								const entries = COMPONENT_LIBRARY.filter((entry) =>
+									group.of.includes(entry.documentType),
+								);
+
+								if (entries.length === 0) return [];
+
+								return [
+									S.divider().title(group.title),
+									...entries.map((entry) =>
+										S.listItem()
+											.title(entry.title)
+											.id(entry.documentType)
+											.icon(componentIcon)
+											.child(
+												S.component()
+													.id(`component-${entry.documentType}`)
+													.title(entry.title)
+													.component(ComponentPreviewPane)
+													.options({
+														notes: entry.notes,
+														path: getComponentPreviewPath(entry.documentType),
+													}),
+											),
 									),
-							),
-							S.divider().title("Reusable Components"),
-							S.documentTypeListItem("hero").title("Headings").icon(heroIcon),
-							S.documentTypeListItem("description")
-								.title("Descriptions")
-								.icon(descriptionIcon),
-							S.documentTypeListItem("gatedContent")
-								.title("Gated Content")
-								.icon(gatedContentIcon),
-							S.documentTypeListItem("blogContent")
-								.title("Blog Content")
-								.icon(contentIcon),
-							S.divider(),
-							S.documentTypeListItem("studioPreview")
-								.title("Component Previews")
-								.icon(pageBuilderCardIcon),
+								];
+							}),
 						]),
 				),
 

package/src/modules/features/cms/sanity-pagebuilder-cache/files/lib/utils/studio-embed.ts

@@ -0,0 +1,22 @@
+import { headers } from "next/headers";
+
+const STUDIO_PATH = "/studio";
+
+const isStudioReferer = (referer: string | null) => {
+	if (!referer) return false;
+
+	try {
+		return new URL(referer).pathname.startsWith(STUDIO_PATH);
+	} catch {
+		return false;
+	}
+};
+
+export const isStudioEmbed = async () => {
+	const headerList = await headers();
+
+	return (
+		headerList.get("sec-fetch-dest") === "iframe" ||
+		isStudioReferer(headerList.get("referer"))
+	);
+};

package/src/modules/features/forms/hubspot/files/_sanity-adapter/form-block.ts

@@ -7,9 +7,10 @@ import {
 import { hubspotFormField } from "./form-field"
 
 /**
- * Sample reusable HubSpot form block. Register it in your schema's document
- * list (and page-builder config, if you use one), then render its `form` with
- * <HubSpotForm /> from the integration core:
+ * Sample HubSpot form block. Register it in your schema's type list, then render
+ * its `form` with <HubSpotForm /> from the integration core. In a page-builder
+ * project re-declare it through `defineBlock` so it becomes an inline block —
+ * the `hubspot-pagebuilder-block` skill walks through it:
  *
  * @example
  * import { HubSpotForm } from "@/lib/integrations/hubspot/form"
@@ -51,10 +52,3 @@ export const hubspotFormBlock = defineType({
     },
   },
 })
-
-export const hubspotFormBlockReference = defineType({
-  name: "hubspotFormBlockReference",
-  title: "HubSpot Form Block",
-  type: "reference",
-  to: [{ type: "hubspotFormBlock" }],
-})