@designcrowd/library.brand-page 6.0.5 → 6.0.6-ast-bugs

package/src/metadata-builder/builders/footer-builder.ts

@@ -10,17 +10,22 @@ import {
 import type {
   UpdateFooterArguments,
   ViewportFooterOverrides,
+  FooterSocialLinkItem,
 } from '../parsers/ai-toolcall-parser';
 import type { Logger } from '../logger';
-import type { TextStyleOptions } from '../../brand-page/models/styles.model';
+import type {
+  TextStyleDeclaration,
+  TextStyleOptions,
+} from '../../brand-page/models/styles.model';
 import { FOOTER_CHECKS } from './section-rules/footer.rules';
-import { applyDetachedStyleOverride } from './section-field-utils';
 import {
-  ensureItemIds,
-  generateItemId,
-  removeItemsByIds,
-  repositionItemByAnchor,
-} from './item-id-utils';
+  applyDetachedStyleOverride,
+  normalizeStyleValue,
+} from './section-field-utils';
+
+type FooterSocialLink = NonNullable<
+  AbstractPageFooterStyles['socialLinks']
+>[number];
 
 const normaliseSocialUrl = (url: string): string => {
   for (const prefix of ['mailto:', 'tel:']) {
@@ -30,6 +35,113 @@ const normaliseSocialUrl = (url: string): string => {
   return url;
 };
 
+const makeSocialLink = (
+  icon: string | undefined,
+  url: string | undefined,
+): FooterSocialLink =>
+  ({
+    imageUrl: icon || '',
+    url: normaliseSocialUrl(url || ''),
+    imageTitle: '',
+    width: 0,
+    height: 0,
+    imageLink: '',
+  }) as FooterSocialLink;
+
+const hasSocialLinkMutation = (args: UpdateFooterArguments): boolean =>
+  args._replace_social_links === true ||
+  (args._remove_social_link_indices?.length ?? 0) > 0 ||
+  (args._reorder_social_links?.length ?? 0) > 0 ||
+  (args.social_links?.length ?? 0) > 0;
+
+/**
+ * Social links are a GLOBAL footer concern — one logical list that both
+ * viewports render identically. Derive the new list ONCE from the current one
+ * WITHOUT mutating the input, so the caller can assign an independent copy to
+ * each viewport.
+ *
+ * Why this can't mutate per-viewport in place: footers migrated from the legacy
+ * single `footerStyles` model (migration-01) share ONE `socialLinks` array
+ * reference across pageFooterDesktop and pageFooterMobile, and `cloneDeep`
+ * preserves that shared reference. Running an in-place `splice` once per
+ * viewport therefore applies it TWICE to the same array — e.g. one requested
+ * removal index drops two links. Compute-once + assign-fresh is correct for
+ * both shared (legacy) and independent (new-model) footers.
+ */
+const computeSocialLinks = (
+  current: FooterSocialLink[] | undefined,
+  args: UpdateFooterArguments,
+): FooterSocialLink[] => {
+  // _replace_social_links: replace entire list (empty/absent social_links = clear all).
+  // A replacement supersedes every other social link mutation.
+  if (args._replace_social_links) {
+    return (args.social_links ?? []).map((l) =>
+      makeSocialLink(l.social_link_icon, l.url),
+    );
+  }
+
+  const links: FooterSocialLink[] = [...(current ?? [])];
+
+  // item_index-based updates for existing links — replace the item reference
+  // (never mutate the original object, which may be shared across viewports).
+  for (const link of args.social_links ?? []) {
+    if (link.item_index === undefined) continue;
+
+    const existing = links[link.item_index];
+
+    if (!existing) continue;
+
+    links[link.item_index] = {
+      ...existing,
+      ...(link.social_link_icon !== undefined
+        ? { imageUrl: link.social_link_icon }
+        : {}),
+      ...(link.url !== undefined ? { url: normaliseSocialUrl(link.url) } : {}),
+    };
+  }
+
+  // Remove by index (descending order to preserve indices during splice).
+  if (args._remove_social_link_indices?.length) {
+    const sorted = [...args._remove_social_link_indices].sort((a, b) => b - a);
+
+    for (const idx of sorted) {
+      if (idx >= 0 && idx < links.length) links.splice(idx, 1);
+    }
+  }
+
+  // Insert new links (descending insert_at order to preserve positions).
+  const insertLinks = (args.social_links ?? []).filter(
+    (l): l is FooterSocialLinkItem & { insert_at: number } =>
+      l.insert_at !== undefined && l.item_index === undefined,
+  );
+  const sortedInserts = [...insertLinks].sort(
+    (a, b) => b.insert_at - a.insert_at,
+  );
+
+  for (const link of sortedInserts) {
+    const pos = Math.max(0, Math.min(link.insert_at, links.length));
+
+    links.splice(pos, 0, makeSocialLink(link.social_link_icon, link.url));
+  }
+
+  // Reorder (requires ALL indices — partial reorder is not supported).
+  if (args._reorder_social_links?.length) {
+    const newOrder = args._reorder_social_links;
+    const unique = new Set(newOrder);
+
+    if (
+      unique.size === newOrder.length &&
+      newOrder.every((idx) => idx >= 0 && idx < links.length)
+    ) {
+      const reordered = newOrder.map((idx) => links[idx]);
+
+      if (reordered.length === links.length) return reordered;
+    }
+  }
+
+  return links;
+};
+
 const applyGlobalFooterChanges = (
   footer: AbstractPageFooterStyles,
   args: UpdateFooterArguments,
@@ -38,85 +150,27 @@ const applyGlobalFooterChanges = (
   if (args.copyright_text !== undefined)
     footer.copyrightText = args.copyright_text;
 
-  if (args.copyright_text_font_family !== undefined)
-    footer.copyrightStyle = applyDetachedStyleOverride(
-      footer.copyrightStyle,
-      { fontFamily: args.copyright_text_font_family },
-      textStyleOptions,
-    );
+  // copyright_text_style is the same text-style object sections use (typography
+  // + colour). Normalise each value the way section styles are normalised
+  // (letterSpacing int→em, lineHeight snap, null→''), then detach from the
+  // global preset via the override helper so a single call resolves the preset
+  // and clears textStyleType once — see resolveGlobalPresetIntoStyle (BP-5420).
+  if (args.copyright_text_style) {
+    const updates: Partial<TextStyleDeclaration> = {};
 
-  const links = args.social_links;
+    for (const [key, value] of Object.entries(args.copyright_text_style)) {
+      const normalized = normalizeStyleValue(key, value);
 
-  // _replace_social_links: replace entire list (empty/absent social_links = clear all).
-  // When replacing, all other social link mutations (remove, insert, reorder) are skipped —
-  // they are superseded by the replacement and running them would cause duplicates.
-  if (args._replace_social_links) {
-    footer.socialLinks = (links ?? []).map((l) => ({
-      id: generateItemId(),
-      imageUrl: l.social_link_icon || '',
-      url: normaliseSocialUrl(l.url || ''),
-      imageTitle: '',
-      width: 0,
-      height: 0,
-      imageLink: '',
-    }));
-  } else {
-    // Targeted mutations — only run when NOT replacing the entire list.
-    // BP-5603: id-based contract (item_id / move_before_item_id / _remove_social_link_ids).
-    // Backfill ids on legacy links so they become referenceable after this call.
-    ensureItemIds(footer.socialLinks);
-
-    // Remove by id (order-independent — no index shifting needed).
-    footer.socialLinks = removeItemsByIds(
-      footer.socialLinks,
-      args._remove_social_link_ids,
-    );
-
-    // Update existing links (item_id present) or insert new links (no item_id).
-    if (links?.length) {
-      footer.socialLinks = footer.socialLinks ?? [];
-
-      for (const link of links) {
-        if (link.item_id) {
-          // Update existing link in place; reposition if move_before_item_id set.
-          const existing = footer.socialLinks.find(
-            (l) => l.id === link.item_id,
-          );
-
-          // Unknown id — skip rather than guess at a position.
-          if (!existing) continue;
-
-          if (link.social_link_icon !== undefined)
-            existing.imageUrl = link.social_link_icon;
-
-          if (link.url !== undefined)
-            existing.url = normaliseSocialUrl(link.url);
-
-          repositionItemByAnchor(
-            footer.socialLinks,
-            existing,
-            link.move_before_item_id,
-          );
-        } else {
-          // New link — assign a stable id and position via move_before_item_id.
-          const newLink = {
-            id: generateItemId(),
-            imageUrl: link.social_link_icon || '',
-            url: normaliseSocialUrl(link.url || ''),
-            imageTitle: '',
-            width: 0,
-            height: 0,
-            imageLink: '' as string | false,
-          };
-
-          repositionItemByAnchor(
-            footer.socialLinks,
-            newLink,
-            link.move_before_item_id,
-          );
-        }
-      }
+      if (normalized !== undefined)
+        (updates as Record<string, unknown>)[key] = normalized;
     }
+
+    if (Object.keys(updates).length > 0)
+      footer.copyrightStyle = applyDetachedStyleOverride(
+        footer.copyrightStyle,
+        updates,
+        textStyleOptions,
+      );
   }
 };
 
@@ -141,12 +195,6 @@ const applyViewportFooterChanges = (
       fill: overrides.icon_color,
     };
 
-  if (overrides.copyright_text_color !== undefined)
-    footer.copyrightStyle = {
-      ...footer.copyrightStyle,
-      color: overrides.copyright_text_color,
-    };
-
   if (overrides.is_logo_visible !== undefined)
     footer.isLogoVisible = overrides.is_logo_visible;
 
@@ -198,13 +246,30 @@ export class FooterBuilder extends BaseMetadataBuilder<UpdateFooterArguments> {
     const args = this.request.payload ?? {};
     const textStyleOptions = model.styles?.textStyles?.textStyleOptions;
 
-    // Global fields (copyright_text, social links) always apply to both viewports.
+    // Global scalar/style fields (copyright text + font) apply to both
+    // viewports. These are idempotent assignments, safe to run per-viewport.
     if (model.pageFooterDesktop)
       applyGlobalFooterChanges(model.pageFooterDesktop, args, textStyleOptions);
 
     if (model.pageFooterMobile)
       applyGlobalFooterChanges(model.pageFooterMobile, args, textStyleOptions);
 
+    // Social links are a single global list. Derive the new list ONCE, then
+    // assign an INDEPENDENT copy to each viewport — never mutate a (possibly
+    // shared) viewport array in place. See computeSocialLinks.
+    if (hasSocialLinkMutation(args)) {
+      const current =
+        model.pageFooterDesktop?.socialLinks ??
+        model.pageFooterMobile?.socialLinks;
+      const updated = computeSocialLinks(current, args);
+
+      if (model.pageFooterDesktop)
+        model.pageFooterDesktop.socialLinks = updated.map((l) => ({ ...l }));
+
+      if (model.pageFooterMobile)
+        model.pageFooterMobile.socialLinks = updated.map((l) => ({ ...l }));
+    }
+
     // Viewport-specific styling via explicit sub-objects.
     if (args.desktop && model.pageFooterDesktop)
       applyViewportFooterChanges(model.pageFooterDesktop, args.desktop);

package/src/metadata-builder/builders/section-builders/image-gallery-builder.ts

@@ -10,12 +10,6 @@ import type { BuilderResult } from '../../models';
 import { applyScalarFields, isValidUrl } from '../section-field-utils';
 import { BaseSectionBuilder } from './base-section-builder';
 import { validateImageGallery } from '../section-rules/image-gallery.rules';
-import {
-  ensureItemIds,
-  generateItemId,
-  removeItemsByIds,
-  repositionItemByAnchor,
-} from '../item-id-utils';
 
 const applyGalleryType = (
   content: ImageGalleryContent,
@@ -27,17 +21,11 @@ const applyGalleryType = (
   };
 };
 
-/**
- * Full rebuild: discard existing images and map the payload directly.
- * Used on create and when `_replace_items` is set. Each item gets a fresh id
- * (or keeps the caller-supplied `item_id` when provided).
- */
 const applyGalleryImages = (
   content: ImageGalleryContent,
   images: ImageGalleryItem[],
 ): void => {
   content.images = images.map((img) => ({
-    id: img.item_id || generateItemId(),
     imageUrl: isValidUrl(img.image_url) ? img.image_url! : '',
     imageTitle: img.caption || '',
     width: 0,
@@ -47,53 +35,84 @@ const applyGalleryImages = (
   }));
 };
 
-/**
- * Id-based merge (BP-5603), mirroring testimonial-section-builder one level
- * deeper into `content.images`:
- *   - `item_id` matches existing item  → update in place; reposition if
- *     `move_before_item_id` is set.
- *   - no `item_id`                     → add new item, positioned by
- *     `move_before_item_id`.
- *   - `removeIds`                      → delete by id (order-independent).
- *
- * Existing items are id-backfilled first so legacy galleries become
- * referenceable as soon as the metadata builder touches them.
- */
 const mergeGalleryImages = (
   content: ImageGalleryContent,
   images: ImageGalleryItem[],
-  removeIds: string[] | undefined,
+  replaceAll: boolean,
 ): void => {
-  ensureItemIds(content.images);
-  content.images = removeItemsByIds(content.images, removeIds);
+  const itemsToMerge = images.filter((img) => img.insert_at === undefined);
+
+  const updatedImages = itemsToMerge.map((img, index) => {
+    const existing = content.images?.[index];
+    const imageUrl = isValidUrl(img.image_url)
+      ? img.image_url!
+      : (existing?.imageUrl ?? '');
+
+    return {
+      ...(existing || {}),
+      imageUrl,
+      imageTitle: img.caption ?? existing?.imageTitle ?? '',
+      width: existing?.width ?? 0,
+      height: existing?.height ?? 0,
+      mediaType: existing?.mediaType ?? 'image',
+      imageLink: existing?.imageLink ?? '',
+    };
+  });
+
+  if (
+    !replaceAll &&
+    content.images &&
+    content.images.length > itemsToMerge.length
+  ) {
+    const extras = content.images.slice(itemsToMerge.length).map((img) => ({
+      imageUrl: img.imageUrl ?? '',
+      imageTitle: img.imageTitle ?? '',
+      width: img.width ?? 0,
+      height: img.height ?? 0,
+      mediaType: img.mediaType ?? ('image' as const),
+      imageLink: img.imageLink ?? '',
+    }));
+
+    updatedImages.push(...extras);
+  }
 
-  for (const img of images) {
-    if (img.item_id) {
-      const existing = content.images.find((i) => i.id === img.item_id);
+  content.images = updatedImages;
+};
 
-      // Unknown id — skip rather than guess at a position.
-      if (!existing) continue;
+const insertGalleryImages = (
+  content: ImageGalleryContent,
+  images: ImageGalleryItem[],
+): void => {
+  const inserts = images.filter((img) => img.insert_at !== undefined);
 
-      if (img.image_url !== undefined) {
-        existing.imageUrl = isValidUrl(img.image_url) ? img.image_url! : '';
-      }
+  if (!inserts.length) return;
 
-      if (img.caption !== undefined) existing.imageTitle = img.caption;
-
-      repositionItemByAnchor(content.images, existing, img.move_before_item_id);
-    } else {
-      const newItem = {
-        id: generateItemId(),
-        imageUrl: isValidUrl(img.image_url) ? img.image_url! : '',
-        imageTitle: img.caption ?? '',
-        width: 0,
-        height: 0,
-        mediaType: 'image' as const,
-        imageLink: '',
-      };
-
-      repositionItemByAnchor(content.images, newItem, img.move_before_item_id);
-    }
+  const sorted = [...inserts].sort(
+    (a, b) => (b.insert_at ?? 0) - (a.insert_at ?? 0),
+  );
+
+  for (const img of sorted) {
+    if (!isValidUrl(img.image_url)) continue;
+
+    if (content.images?.some((existing) => existing.imageUrl === img.image_url))
+      continue;
+
+    content.images = content.images ?? [];
+
+    const pos = Math.max(
+      0,
+      Math.min(img.insert_at ?? 0, content.images.length),
+    );
+
+    content.images.splice(pos, 0, {
+      imageUrl: img.image_url!,
+      imageTitle: img.caption ?? '',
+      width: 0,
+      height: 0,
+      mediaType: 'image',
+      imageLink: '',
+      colorReplacements: [],
+    });
   }
 };
 
@@ -125,19 +144,26 @@ export class ImageGalleryBuilder extends BaseSectionBuilder<ImageGalleryContent>
       applyGalleryType(content, args.gallery_type);
     }
 
-    if (args._replace_items && args.images && Array.isArray(args.images)) {
-      // Full replacement: discard existing images and rebuild from the payload.
-      applyGalleryImages(content, args.images);
-    } else if (this.mode === 'create') {
-      if (args.images && Array.isArray(args.images)) {
+    if (args.images && Array.isArray(args.images)) {
+      if (this.mode === 'create') {
         applyGalleryImages(content, args.images);
+      } else {
+        mergeGalleryImages(content, args.images, !!args._replace_items);
       }
-    } else if (
-      (args.images && Array.isArray(args.images)) ||
-      args._remove_item_ids?.length
-    ) {
-      // Update: id-based add / edit / move / remove in a single pass.
-      mergeGalleryImages(content, args.images ?? [], args._remove_item_ids);
+    }
+
+    if (args._remove_item_indices?.length && content.images) {
+      const sorted = [...args._remove_item_indices].sort((a, b) => b - a);
+
+      for (const idx of sorted) {
+        if (idx >= 0 && idx < content.images.length) {
+          content.images.splice(idx, 1);
+        }
+      }
+    }
+
+    if (args.images && Array.isArray(args.images) && this.mode === 'update') {
+      insertGalleryImages(content, args.images);
     }
 
     return { request: this.request, model };