@designcrowd/library.brand-page 5.17.28 → 5.18.0

package/src/metadata-builder/builders/section-builders/images-section-builder.ts

@@ -1,38 +1,41 @@
 import type {
   ImagesSectionContent,
   BrandPageModel,
+  TextStyleDeclaration,
 } from '../../../brand-page/models';
-import type {
-  ImagesSectionArguments,
-  ImagesSectionItem,
-} from '../../parsers/section-tool-arguments';
+import { tiptapJsonToHtml } from '../../helpers/rte.helpers';
 import type { BuilderResult } from '../../models';
+import {
+  isTiptapDocument,
+  type ImagesSectionArguments,
+  type ImagesSectionItem,
+} from '../../parsers/section-tool-arguments';
 import {
   applyScalarFields,
   applyStyleFields,
-  applyRTEStyles,
+  isValidUrl,
+  resolveGlobalPresetIntoStyle,
 } from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
+import { validateImagesSection } from '../section-rules/images-section.rules';
 
 const applyImageItems = (
   content: ImagesSectionContent,
   items: ImagesSectionItem[],
 ): void => {
-  content.items = items
-    .filter((item) => !!item.image_url)
-    .map((item, index) => ({
-      imageUrl: item.image_url || '',
-      imageTitle: '',
-      width: 0,
-      height: 0,
-      mediaType: 'image',
-      imageLink: '',
-      title: item.heading || '',
-      paragraph: item.text || '',
-      buttonText: item.button_text || false,
-      itemsId: index,
-      colorReplacements: [],
-    }));
+  content.items = items.map((item, index) => ({
+    imageUrl: isValidUrl(item.image_url) ? item.image_url! : '',
+    imageTitle: '',
+    width: 0,
+    height: 0,
+    mediaType: 'image',
+    imageLink: '',
+    title: item.heading || '',
+    paragraph: item.text || '',
+    buttonText: item.button_text || false,
+    itemsId: index,
+    colorReplacements: [],
+  }));
 };
 
 const mergeImageItems = (
@@ -55,7 +58,7 @@ const mergeImageItems = (
 
       const existing = content.items[targetIndex];
 
-      if (item.image_url !== undefined) existing.imageUrl = item.image_url;
+      if (isValidUrl(item.image_url)) existing.imageUrl = item.image_url!;
 
       if (item.heading !== undefined) existing.title = item.heading;
 
@@ -68,29 +71,37 @@ const mergeImageItems = (
     return;
   }
 
-  const updatedItems = items
-    .map((item, index) => {
-      const existing = content.items?.[index];
-
-      return {
-        ...(existing || {}),
-        imageUrl: item.image_url ?? existing?.imageUrl ?? '',
-        imageTitle: existing?.imageTitle ?? '',
-        width: existing?.width ?? 0,
-        height: existing?.height ?? 0,
-        mediaType: existing?.mediaType ?? 'image',
-        imageLink: existing?.imageLink ?? '',
-        title: item.heading ?? existing?.title ?? '',
-        paragraph: item.text ?? existing?.paragraph ?? '',
-        buttonText: item.button_text ?? existing?.buttonText ?? '',
-        itemsId: existing?.itemsId ?? index,
-        colorReplacements: existing?.colorReplacements ?? [],
-      };
-    })
-    .filter((item) => !!item.imageUrl);
-
-  if (!replaceAll && content.items && content.items.length > items.length) {
-    const remaining = content.items.slice(items.length) as typeof updatedItems;
+  const itemsToMerge = items.filter((item) => item.insert_at === undefined);
+
+  const updatedItems = itemsToMerge.map((item, index) => {
+    const existing = content.items?.[index];
+
+    return {
+      ...(existing || {}),
+      imageUrl: isValidUrl(item.image_url)
+        ? item.image_url!
+        : existing?.imageUrl ?? '',
+      imageTitle: existing?.imageTitle ?? '',
+      width: existing?.width ?? 0,
+      height: existing?.height ?? 0,
+      mediaType: existing?.mediaType ?? 'image',
+      imageLink: existing?.imageLink ?? '',
+      title: item.heading ?? existing?.title ?? '',
+      paragraph: item.text ?? existing?.paragraph ?? '',
+      buttonText: item.button_text ?? existing?.buttonText ?? '',
+      itemsId: existing?.itemsId ?? index,
+      colorReplacements: existing?.colorReplacements ?? [],
+    };
+  });
+
+  if (
+    !replaceAll &&
+    content.items &&
+    content.items.length > itemsToMerge.length
+  ) {
+    const remaining = content.items.slice(
+      itemsToMerge.length,
+    ) as typeof updatedItems;
 
     updatedItems.push(...remaining);
   }
@@ -99,6 +110,10 @@ const mergeImageItems = (
 };
 
 export class ImagesSectionBuilder extends BaseSectionBuilder<ImagesSectionContent> {
+  protected get sectionValidate() {
+    return validateImagesSection;
+  }
+
   async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
     this.log('Build called');
 
@@ -108,17 +123,46 @@ export class ImagesSectionBuilder extends BaseSectionBuilder<ImagesSectionConten
       return { request: this.request, model, errors: validation.errors };
     }
 
-    const resolved = this.resolveContent(model);
+    const resolved = this.resolveAndRepositionContent(model);
 
     if ('error' in resolved) return resolved.error;
 
     const content = resolved.content;
 
     applyScalarFields(content, this.args, this.sectionType);
-    applyStyleFields(content, this.args, this.sectionType);
-    applyRTEStyles(content, this.args, this.sectionType);
+    applyStyleFields(
+      content,
+      this.args,
+      this.sectionType,
+      this.getGlobalTextStyles(model),
+    );
 
     const args = this.args as ImagesSectionArguments;
+    const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
+
+    if (args.title !== undefined) {
+      if (isTiptapDocument(args.title)) {
+        content.title = tiptapJsonToHtml(args.title);
+        content.titleStyle = resolveGlobalPresetIntoStyle(
+          content.titleStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        content.title = args.title;
+      }
+    }
+
+    if (args.description !== undefined) {
+      if (isTiptapDocument(args.description)) {
+        content.description = tiptapJsonToHtml(args.description);
+        content.descriptionStyle = resolveGlobalPresetIntoStyle(
+          content.descriptionStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        content.description = args.description;
+      }
+    }
 
     if (args.background_style && typeof args.background_style === 'object') {
       const existing = content.backgroundStyle || {};
@@ -177,7 +221,17 @@ export class ImagesSectionBuilder extends BaseSectionBuilder<ImagesSectionConten
       );
 
       for (const item of sortedInserts) {
-        if (!item.image_url) continue;
+        if (!isValidUrl(item.image_url)) continue;
+
+        // Skip if this image_url already exists — defensive against duplicate
+        // tool call application
+        if (
+          content.items?.some(
+            (existing: any) => existing.imageUrl === item.image_url,
+          )
+        ) {
+          continue;
+        }
 
         const pos = Math.max(
           0,

package/src/metadata-builder/builders/section-builders/index.ts

@@ -4,6 +4,7 @@ export {
 } from './base-section-builder';
 
 export { BannerSectionBuilder } from './banner-section-builder';
+export { BookingSectionBuilder } from './booking-section-builder';
 export { AboutSectionBuilder } from './about-section-builder';
 export { ContactFormBuilder } from './contact-form-builder';
 export { DividerSectionBuilder } from './divider-section-builder';

package/src/metadata-builder/builders/section-builders/mailing-list-builder.ts

@@ -2,11 +2,26 @@ import type { BuilderResult } from '@src/metadata-builder/models';
 import type {
   BrandPageModel,
   MailingListContent,
+  TextStyleDeclaration,
 } from '../../../brand-page/models';
-import { applyScalarFields } from '../section-field-utils';
+import { tiptapJsonToHtml } from '../../helpers/rte.helpers';
+import {
+  isTiptapDocument,
+  type MailingListSectionArguments,
+} from '../../parsers/section-tool-arguments';
+import {
+  applyScalarFields,
+  applyStyleFields,
+  resolveGlobalPresetIntoStyle,
+} from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
+import { validateMailingList } from '../section-rules/mailing-list.rules';
 
 export class MailingListBuilder extends BaseSectionBuilder<MailingListContent> {
+  protected get sectionValidate() {
+    return validateMailingList;
+  }
+
   async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
     this.log('Build called');
 
@@ -16,13 +31,34 @@ export class MailingListBuilder extends BaseSectionBuilder<MailingListContent> {
       return { request: this.request, model, errors: validation.errors };
     }
 
-    const resolved = this.resolveContent(model);
+    const resolved = this.resolveAndRepositionContent(model);
 
     if ('error' in resolved) return resolved.error;
 
     const content = resolved.content;
 
     applyScalarFields(content, this.args, this.sectionType);
+    applyStyleFields(
+      content,
+      this.args,
+      this.sectionType,
+      this.getGlobalTextStyles(model),
+    );
+
+    const mailingListArgs = this.args as MailingListSectionArguments;
+    const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
+
+    if (mailingListArgs.title !== undefined) {
+      if (isTiptapDocument(mailingListArgs.title)) {
+        content.title = tiptapJsonToHtml(mailingListArgs.title);
+        content.titleStyle = resolveGlobalPresetIntoStyle(
+          content.titleStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        content.title = mailingListArgs.title;
+      }
+    }
 
     return { request: this.request, model };
   }

package/src/metadata-builder/builders/section-builders/mailing-list-section-builder.ts

@@ -1,12 +1,27 @@
 import type {
   MailingListContent,
   BrandPageModel,
+  TextStyleDeclaration,
 } from '../../../brand-page/models';
+import { tiptapJsonToHtml } from '../../helpers/rte.helpers';
 import type { BuilderResult } from '../../models';
-import { applyScalarFields } from '../section-field-utils';
+import {
+  isTiptapDocument,
+  type MailingListSectionArguments,
+} from '../../parsers/section-tool-arguments';
+import {
+  applyScalarFields,
+  applyStyleFields,
+  resolveGlobalPresetIntoStyle,
+} from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
+import { validateMailingList } from '../section-rules/mailing-list.rules';
 
 export class MailingListSectionBuilder extends BaseSectionBuilder<MailingListContent> {
+  protected get sectionValidate() {
+    return validateMailingList;
+  }
+
   async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
     this.log('Build called');
 
@@ -16,11 +31,32 @@ export class MailingListSectionBuilder extends BaseSectionBuilder<MailingListCon
       return { request: this.request, model, errors: validation.errors };
     }
 
-    const resolved = this.resolveContent(model);
+    const resolved = this.resolveAndRepositionContent(model);
 
     if ('error' in resolved) return resolved.error;
 
     applyScalarFields(resolved.content, this.args, this.sectionType);
+    applyStyleFields(
+      resolved.content,
+      this.args,
+      this.sectionType,
+      this.getGlobalTextStyles(model),
+    );
+
+    const mailingListArgs = this.args as MailingListSectionArguments;
+    const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
+
+    if (mailingListArgs.title !== undefined) {
+      if (isTiptapDocument(mailingListArgs.title)) {
+        resolved.content.title = tiptapJsonToHtml(mailingListArgs.title);
+        resolved.content.titleStyle = resolveGlobalPresetIntoStyle(
+          resolved.content.titleStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        resolved.content.title = mailingListArgs.title;
+      }
+    }
 
     return { request: this.request, model };
   }

package/src/metadata-builder/builders/section-builders/profile-section-builder.ts

@@ -1,13 +1,26 @@
 import type {
   ProfileContent,
   BrandPageModel,
+  TextStyleDeclaration,
 } from '../../../brand-page/models';
+import { tiptapJsonToHtml } from '../../helpers/rte.helpers';
 import type { BuilderResult } from '../../models';
-import type { ProfileSectionArguments } from '../../parsers/section-tool-arguments';
-import { applyScalarFields } from '../section-field-utils';
+import {
+  isTiptapDocument,
+  type ProfileSectionArguments,
+} from '../../parsers/section-tool-arguments';
+import {
+  applyScalarFields,
+  resolveGlobalPresetIntoStyle,
+} from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
+import { validateProfile } from '../section-rules/profile.rules';
 
 export class ProfileSectionBuilder extends BaseSectionBuilder<ProfileContent> {
+  protected get sectionValidate() {
+    return validateProfile;
+  }
+
   async buildAsync(model: BrandPageModel): Promise<BuilderResult> {
     this.log('Build called');
 
@@ -17,13 +30,52 @@ export class ProfileSectionBuilder extends BaseSectionBuilder<ProfileContent> {
       return { request: this.request, model, errors: validation.errors };
     }
 
-    const resolved = this.resolveContent(model);
+    const resolved = this.resolveAndRepositionContent(model);
 
     if ('error' in resolved) return resolved.error;
 
     applyScalarFields(resolved.content, this.args, this.sectionType);
 
     const profileArgs = this.args as ProfileSectionArguments;
+    const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
+
+    if (profileArgs.name !== undefined) {
+      if (isTiptapDocument(profileArgs.name)) {
+        resolved.content.name = tiptapJsonToHtml(profileArgs.name);
+        resolved.content.nameStyle = resolveGlobalPresetIntoStyle(
+          resolved.content.nameStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        resolved.content.name = profileArgs.name;
+      }
+    }
+
+    if (profileArgs.title !== undefined) {
+      if (isTiptapDocument(profileArgs.title)) {
+        resolved.content.title = tiptapJsonToHtml(profileArgs.title);
+        resolved.content.titleStyle = resolveGlobalPresetIntoStyle(
+          resolved.content.titleStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        resolved.content.title = profileArgs.title;
+      }
+    }
+
+    if (profileArgs.description !== undefined) {
+      if (isTiptapDocument(profileArgs.description)) {
+        resolved.content.description = tiptapJsonToHtml(
+          profileArgs.description,
+        );
+        resolved.content.descriptionStyle = resolveGlobalPresetIntoStyle(
+          resolved.content.descriptionStyle,
+          textStyleOptions,
+        ) as TextStyleDeclaration;
+      } else {
+        resolved.content.description = profileArgs.description;
+      }
+    }
 
     if (profileArgs.background_color !== undefined) {
       resolved.content.backgroundColor = {