medusa-storefront-data 2.3.0 → 2.5.1

package/src/server/dynamic-config.ts

@@ -1,4 +1,4 @@
-"use server"
+import "server-only"
 
 import { cache } from "react"
 import { getAuthHeaders } from "../cookies"
@@ -7,74 +7,20 @@ import {
   HOME_SECTION_COPY_ID_LIST,
   type DefaultHomeSectionId,
 } from "./homepage-section-defaults"
+import type { DynamicConfigResponse, HomepageConfig } from "./homepage-config.types"
+import { mergeSectionBlock } from "./config-merge"
+import { mergePageInputWithDefaults, resolvePageInput } from "./page-input"
+
+export {
+  DEFAULT_PAGE_INPUT,
+  mergePageInputWithDefaults,
+  resolvePageInput,
+  homepageConfigFromDynamicResponse,
+  type StorefrontPageInput,
+} from "./page-input"
 
-// Define the structure based on the actual API response and client usage
-export interface DynamicConfig {
-  "homepage-config"?: {
-    logo?: string
-    "homepage-banner-array"?: Array<{
-      "homepage-banner"?: {
-        "homepage-banner-image"?: string
-        "homepage-banner-title"?: string
-        "homepage-banner-subtitle"?: string
-        "homepage-banner-description"?: string
-        "homepage-banner-button-name"?: string
-        "homepage-banner-button-link"?: string
-      }
-    }>
-    "app-banner-array"?: Array<{
-      "app-banner"?: {
-        "app-banner-image"?: string
-        "app-banner-title"?: string
-        "app-banner-subtitle"?: string
-        "app-banner-description"?: string
-        "app-banner-button-name"?: string
-        "app-banner-button-link"?: string
-        "app-banner-link"?: string
-      }
-    }>
-    "website-description"?: string
-    "website_description"?: string
-    "why-choose-us-title"?: string
-    "why-choose-us-features"?: Array<{
-      feature?: {
-        "feature-name"?: string
-        "feature-icon"?: string
-      }
-      // Handle potential direct structure if any
-      "feature-name"?: string
-      "feature-icon"?: string
-    }>
-    "contact-us"?: {
-      "contact-phone"?: string
-      "contact-email"?: string
-      "contact-address"?: string
-    }
-    "social-links"?: Array<{
-      "social-link"?: {
-        "social-platform-name"?: string
-        "social-platform-icon"?: string
-        "social-platform-url"?: string
-      }
-      // Handle potential direct structure if any
-      "social-platform-name"?: string
-      "social-platform-icon"?: string
-      "social-platform-url"?: string
-    }>
-    "promo-bar"?: {
-      "promo-text"?: string
-      "promo-code"?: string
-      "promo-value"?: string
-      "promo-active"?: boolean
-    }
-    /** Central homepage section copy (Option 1). Keys: camelCase or kebab-case section ids. */
-    sections?: Record<string, unknown>
-    // Allow for other properties
-    [key: string]: any
-  }
-}
 
-export const getDynamicConfig = cache(async (): Promise<DynamicConfig | null> => {
+export const getDynamicConfig = cache(async (): Promise<DynamicConfigResponse | null> => {
   try {
     const publishableKey = process.env.NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY
     const baseUrl = process.env.MEDUSA_BACKEND_URL || "http://localhost:9000"
@@ -123,166 +69,96 @@ export const getDynamicConfig = cache(async (): Promise<DynamicConfig | null> =>
   }
 })
 
-export const getLogoFromConfig = async (): Promise<string | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const logo = config?.["homepage-config"]?.logo
-
-    return logo || null
-  } catch (error) {
-
-    return null
-  }
+export function getLogoFromPageInput(
+  pageInput?: HomepageConfig | null
+): string | null {
+  const config = resolvePageInput(pageInput)
+  return config.logo || null
 }
 
-export const getBannerImageFromConfig = async (): Promise<string | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const bannerArray = config?.["homepage-config"]?.["homepage-banner-array"]
 
-    if (bannerArray && bannerArray.length > 0) {
-      const firstBanner = bannerArray[0]
-      const image = firstBanner?.["homepage-banner"]?.["homepage-banner-image"]
 
-      return image || null
-    }
 
-
-    return null
-  } catch (error) {
-
-    return null
+export type HomepageBanner = {
+  image?: string
+  title?: string
+  subtitle?: string
+  description?: string
+  buttonName?: string
+  buttonLink?: string
+}
+
+export function getHomeBannersFromPageInput(
+  pageInput?: HomepageConfig | null
+): HomepageBanner[] | null {
+  const config = resolvePageInput(pageInput)
+  const bannerArray = config["homepage-banner-array"]
+  if (bannerArray && bannerArray.length > 0) {
+    return bannerArray.map((item) => {
+      const banner = item["homepage-banner"]
+      return {
+        image: banner?.["homepage-banner-image"],
+        title: normalizeCmsText(banner?.["homepage-banner-title"]),
+        subtitle: normalizeCmsText(banner?.["homepage-banner-subtitle"]),
+        description: normalizeCmsText(banner?.["homepage-banner-description"]),
+        buttonName: normalizeBannerButtonName(banner?.["homepage-banner-button-name"]),
+        buttonLink: banner?.["homepage-banner-button-link"],
+      }
+    })
   }
+  return null
 }
 
-export const getMobileBannerFromConfig = async (): Promise<{ image: string | null; link: string | null }> => {
-  try {
-    const config = await getDynamicConfig()
-    const bannerArray = config?.["homepage-config"]?.["app-banner-array"]
-
-    if (bannerArray && bannerArray.length > 0) {
-      const firstBanner = bannerArray[0]
-      const image = firstBanner?.["app-banner"]?.["app-banner-image"] || null
-      const link = firstBanner?.["app-banner"]?.["app-banner-button-link"] || firstBanner?.["app-banner"]?.["app-banner-link"] || null
-
-      return { image, link }
-    }
-
-
-    return { image: null, link: null }
-  } catch (error) {
-
-    return { image: null, link: null }
+export function getAppBannersFromPageInput(
+  pageInput?: HomepageConfig | null
+): HomepageBanner[] | null {
+  const config = resolvePageInput(pageInput)
+  const bannerArray = config["app-banner-array"]
+  if (bannerArray && bannerArray.length > 0) {
+    return bannerArray.map((item) => {
+      const banner = item["app-banner"]
+      return {
+        image: banner?.["app-banner-image"],
+        title: normalizeCmsText(banner?.["app-banner-title"]),
+        subtitle: normalizeCmsText(banner?.["app-banner-subtitle"]),
+        description: normalizeCmsText(banner?.["app-banner-description"]),
+        buttonName: normalizeBannerButtonName(banner?.["app-banner-button-name"]),
+        buttonLink: banner?.["app-banner-button-link"],
+      }
+    })
   }
+  return null
 }
 
-export const getHomeBannersFromConfig = async (): Promise<Array<{
-  image?: string;
-  title?: string;
-  subtitle?: string;
-  description?: string;
-  buttonName?: string;
-  buttonLink?: string;
-}> | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const bannerArray = config?.["homepage-config"]?.["homepage-banner-array"]
-
-    if (bannerArray && bannerArray.length > 0) {
-      return bannerArray.map(item => {
-        const banner = item["homepage-banner"]
-        return {
-          image: banner?.["homepage-banner-image"],
-          title: normalizeCmsText(banner?.["homepage-banner-title"]),
-          subtitle: normalizeCmsText(banner?.["homepage-banner-subtitle"]),
-          description: normalizeCmsText(banner?.["homepage-banner-description"]),
-          buttonName: normalizeBannerButtonName(banner?.["homepage-banner-button-name"]),
-          buttonLink: banner?.["homepage-banner-button-link"],
-        }
-      })
-    }
-    return null
-  } catch (error) {
 
-    return null
-  }
-}
-
-export const getAppBannersFromConfig = async (): Promise<Array<{
-  image?: string;
-  title?: string;
-  subtitle?: string;
-  description?: string;
-  buttonName?: string;
-  buttonLink?: string;
-}> | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const bannerArray = config?.["homepage-config"]?.["app-banner-array"]
-
-    if (bannerArray && bannerArray.length > 0) {
-      return bannerArray.map(item => {
-        const banner = item["app-banner"]
-        return {
-          image: banner?.["app-banner-image"],
-          title: normalizeCmsText(banner?.["app-banner-title"]),
-          subtitle: normalizeCmsText(banner?.["app-banner-subtitle"]),
-          description: normalizeCmsText(banner?.["app-banner-description"]),
-          buttonName: normalizeBannerButtonName(banner?.["app-banner-button-name"]),
-          buttonLink: banner?.["app-banner-button-link"],
-        }
-      })
-    }
-    return null
-  } catch (error) {
-
-    return null
-  }
-}
 
 // Legacy function for backward compatibility
-export const getMobileBannerImageFromConfig = async (): Promise<string | null> => {
-  const { image } = await getMobileBannerFromConfig()
-  return image
-}
-
-export const getWebsiteDescriptionFromConfig = async (): Promise<string | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const homepageConfig = config?.["homepage-config"]
-    const desc = homepageConfig?.["website-description"] || homepageConfig?.["website_description"]
-
 
-    return desc || null
-  } catch (error) {
-
-    return null
-  }
+export function getWebsiteDescriptionFromPageInput(
+  pageInput?: HomepageConfig | null
+): string | null {
+  const config = resolvePageInput(pageInput)
+  const desc = config["website-description"] || config["website_description"]
+  return desc || null
 }
 
+
 /** Why choose us — defaults + `sections.whyChooseUs` override. */
-export const getFeaturesFromConfig = async (): Promise<{
+export function getFeaturesFromPageInput(
+  pageInput?: HomepageConfig | null
+): {
   title: string
   features: Array<{ name: string; icon: string }>
-}> => {
-  try {
-    const block = await getMergedSectionBlock("whyChooseUs")
-    const copy = parseSectionCopy(block)
-    const title = copy.title ?? copy.name ?? ""
-    const featuresRaw = block.features ?? block.items ?? []
-    const features = parseFeatureIconList(featuresRaw)
-
-    return { title, features }
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.whyChooseUs
-    const copy = parseSectionCopy(block)
-    return {
-      title: copy.title ?? copy.name ?? "",
-      features: parseFeatureIconList(block.features ?? []),
-    }
-  }
+} {
+  const block = getMergedSectionBlock("whyChooseUs", pageInput)
+  const copy = parseSectionCopy(block)
+  const title = copy.title ?? copy.name ?? ""
+  const featuresRaw = block.features ?? block.items ?? []
+  const features = parseFeatureIconList(featuresRaw)
+  return { title, features }
 }
 
+
 function parseFeatureIconList(raw: unknown): Array<{ name: string; icon: string }> {
   if (!Array.isArray(raw)) return []
   return raw
@@ -318,6 +194,9 @@ export type SectionCopy = {
   description: string | null
   subtitle: string | null
   eyebrow: string | null
+  /** Layout variant, e.g. new arrivals `grid` | `classic`. */
+  variant: string | null
+  layout: string | null
 }
 
 const EMPTY_SECTION_COPY: SectionCopy = {
@@ -327,6 +206,8 @@ const EMPTY_SECTION_COPY: SectionCopy = {
   description: null,
   subtitle: null,
   eyebrow: null,
+  variant: null,
+  layout: null,
 }
 
 export function parseSectionCopy(block: unknown): SectionCopy {
@@ -339,6 +220,8 @@ export function parseSectionCopy(block: unknown): SectionCopy {
     description: normalizeCmsText(row.description) ?? null,
     subtitle: normalizeCmsText(row.subtitle) ?? null,
     eyebrow: normalizeCmsText(row.eyebrow) ?? null,
+    variant: normalizeCmsText(row.variant) ?? null,
+    layout: normalizeCmsText(row.layout) ?? null,
   }
 }
 
@@ -355,9 +238,11 @@ function sectionIdFromConfigKey(key: string): HomeSectionCopyId | null {
   return HOME_SECTION_COPY_IDS.has(id) ? id : null
 }
 
-async function getHomepageSectionsRoot(): Promise<Record<string, unknown>> {
-  const config = await getDynamicConfig()
-  const root = config?.["homepage-config"]?.sections
+function getHomepageSectionsRoot(
+  pageInput?: HomepageConfig | null
+): Record<string, unknown> {
+  const config = resolvePageInput(pageInput)
+  const root = config.sections
   return root && typeof root === "object"
     ? (root as Record<string, unknown>)
     : {}
@@ -379,42 +264,13 @@ function findSectionBlock(
   return null
 }
 
-/** Merge CMS section block onto package defaults (override wins when set). */
-export function mergeSectionBlock(
-  defaults: Record<string, unknown>,
-  override: Record<string, unknown> | null
-): Record<string, unknown> {
-  if (!override) return { ...defaults }
-  const merged = { ...defaults }
-  for (const [key, value] of Object.entries(override)) {
-    if (value === undefined || value === null) continue
-    if (Array.isArray(value)) {
-      if (value.length > 0) merged[key] = value
-      continue
-    }
-    if (typeof value === "string") {
-      if (value.trim()) merged[key] = value.trim()
-      continue
-    }
-    if (typeof value === "boolean" || typeof value === "number") {
-      merged[key] = value
-      continue
-    }
-    if (typeof value === "object") {
-      const base =
-        merged[key] && typeof merged[key] === "object" && !Array.isArray(merged[key])
-          ? (merged[key] as Record<string, unknown>)
-          : {}
-      merged[key] = mergeSectionBlock(base, value as Record<string, unknown>)
-    }
-  }
-  return merged
-}
+export { mergeSectionBlock } from "./config-merge"
 
-async function getMergedSectionBlock(
-  id: HomeSectionCopyId
-): Promise<Record<string, unknown>> {
-  const root = await getHomepageSectionsRoot()
+export function getMergedSectionBlock(
+  id: HomeSectionCopyId,
+  pageInput?: HomepageConfig | null
+): Record<string, unknown> {
+  const root = getHomepageSectionsRoot(pageInput)
   const defaults = DEFAULT_HOMEPAGE_SECTIONS[id] ?? {}
   const override = findSectionBlock(root, id)
   return mergeSectionBlock(
@@ -433,6 +289,8 @@ function mergeSectionCopy(base: SectionCopy, patch: SectionCopy): SectionCopy {
     description: pick(patch.description, base.description),
     subtitle: pick(patch.subtitle, base.subtitle),
     eyebrow: pick(patch.eyebrow, base.eyebrow),
+    variant: pick(patch.variant ?? patch.layout, base.variant ?? base.layout),
+    layout: pick(patch.layout ?? patch.variant, base.layout ?? base.variant),
   }
 }
 
@@ -456,23 +314,18 @@ function parseAnnouncementMessages(block: Record<string, unknown> | null): strin
 /**
  * Merged section copy: package defaults + `homepage-config.sections` overrides.
  */
-export const getHomeSectionsCopyFromConfig = async (): Promise<HomeSectionsCopy> => {
-  try {
-    const copy = {} as HomeSectionsCopy
-    for (const id of HOME_SECTION_COPY_ID_LIST) {
-      const block = await getMergedSectionBlock(id)
-      copy[id] = parseSectionCopy(block)
-    }
-    return copy
-  } catch {
-    const fallback = {} as HomeSectionsCopy
-    for (const id of HOME_SECTION_COPY_ID_LIST) {
-      fallback[id] = parseSectionCopy(DEFAULT_HOMEPAGE_SECTIONS[id])
-    }
-    return fallback
+export function getHomeSectionsCopyFromPageInput(
+  pageInput?: HomepageConfig | null
+): HomeSectionsCopy {
+  const copy = {} as HomeSectionsCopy
+  for (const id of HOME_SECTION_COPY_ID_LIST) {
+    const block = getMergedSectionBlock(id, pageInput)
+    copy[id] = parseSectionCopy(block)
   }
+  return copy
 }
 
+
 export type TrustFeaturesConfig = {
   title: string | null
   description: string | null
@@ -480,27 +333,19 @@ export type TrustFeaturesConfig = {
 }
 
 /** Trust badge row — defaults + `sections.features` override. */
-export const getTrustFeaturesFromConfig = async (): Promise<TrustFeaturesConfig> => {
-  try {
-    const block = await getMergedSectionBlock("features")
-    const copy = parseSectionCopy(block)
-    const title = copy.title ?? copy.name
-    const description = copy.description ?? copy.text
-    const rawList = block.features ?? block.items ?? []
-    const features = parseFeatureIconList(rawList)
-
-    return { title: title ?? null, description: description ?? null, features }
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.features
-    const copy = parseSectionCopy(block)
-    return {
-      title: copy.title,
-      description: copy.description,
-      features: parseFeatureIconList(block.features ?? []),
-    }
-  }
+export function getTrustFeaturesFromPageInput(
+  pageInput?: HomepageConfig | null
+): TrustFeaturesConfig {
+  const block = getMergedSectionBlock("features", pageInput)
+  const copy = parseSectionCopy(block)
+  const title = copy.title ?? copy.name
+  const description = copy.description ?? copy.text
+  const rawList = block.features ?? block.items ?? []
+  const features = parseFeatureIconList(rawList)
+  return { title: title ?? null, description: description ?? null, features }
 }
 
+
 function normalizeBannerButtonName(value: unknown): string | undefined {
   const text = normalizeCmsText(value)
   if (!text) return undefined
@@ -514,29 +359,22 @@ function normalizeConfigEmail(value: unknown): string | undefined {
   return EMAIL_PATTERN.test(trimmed) ? trimmed : undefined
 }
 
-export const getContactInfoFromConfig = async (): Promise<{ phone?: string; email?: string; address?: string } | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const contactConfig = config?.["homepage-config"]?.["contact-us"]
+export type ContactInfo = { phone?: string; email?: string; address?: string }
 
-    if (!contactConfig) {
-
-      return null
-    }
-
-
-
-    return {
-      phone: contactConfig["contact-phone"],
-      email: normalizeConfigEmail(contactConfig["contact-email"]),
-      address: contactConfig["contact-address"],
-    }
-  } catch (error) {
-
-    return null
+export function getContactInfoFromPageInput(
+  pageInput?: HomepageConfig | null
+): ContactInfo | null {
+  const config = resolvePageInput(pageInput)
+  const contactConfig = config["contact-us"]
+  if (!contactConfig) return null
+  return {
+    phone: contactConfig["contact-phone"],
+    email: normalizeConfigEmail(contactConfig["contact-email"]),
+    address: contactConfig["contact-address"],
   }
 }
 
+
 function normalizeVideoStoryUrl(entry: unknown): string | null {
   if (typeof entry === "string" && entry.trim()) return entry.trim()
   if (!entry || typeof entry !== "object") return null
@@ -557,144 +395,173 @@ function normalizeVideoStoryUrl(entry: unknown): string | null {
 /**
  * Homepage video stories/reviews carousel (`homepage-config.video-stories`).
  */
-export const getVideoStoriesFromConfig = async (): Promise<{
-  title: string
-  videoUrls: string[]
-} | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const homepageConfig = config?.["homepage-config"]
-    if (!homepageConfig) return null
-
-    const block = await getMergedSectionBlock("videoStories")
-    const copy = parseSectionCopy(block)
-    const title = copy.title ?? copy.name ?? ""
-
-    const raw =
-      block["video-urls"] ??
-      block.videoUrls ??
-      block.videos ??
-      block["video-stories"] ??
-      homepageConfig["video-stories"] ??
-      homepageConfig["video-stories-array"] ??
-      homepageConfig["video_stories"] ??
-      []
-
-    const list = Array.isArray(raw) ? raw : [raw]
-    const videoUrls = list
-      .map(normalizeVideoStoryUrl)
-      .filter((url): url is string => Boolean(url))
-
-    return { title, videoUrls }
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.videoStories
-    const copy = parseSectionCopy(block)
-    return {
-      title: copy.title ?? copy.name ?? "",
-      videoUrls: [],
-    }
+export function getVideoStoriesFromPageInput(
+  pageInput?: HomepageConfig | null
+): { title: string; videoUrls: string[] } {
+  const homepageConfig = resolvePageInput(pageInput)
+  const block = getMergedSectionBlock("videoStories", pageInput)
+  const copy = parseSectionCopy(block)
+  const title = copy.title ?? copy.name ?? ""
+  const raw =
+    block["video-urls"] ??
+    block.videoUrls ??
+    block.videos ??
+    block["video-stories"] ??
+    homepageConfig["video-stories"] ??
+    homepageConfig["video-stories-array"] ??
+    homepageConfig["video_stories"] ??
+    []
+  const list = Array.isArray(raw) ? raw : [raw]
+  const videoUrls = list
+    .map(normalizeVideoStoryUrl)
+    .filter((url): url is string => Boolean(url))
+  return { title, videoUrls }
+}
+
+
+export type TestimonialItem = {
+  id: string
+  text: string
+  name: string
+  rating?: number
+  avatar?: string
+}
+
+function parseTestimonialRow(
+  item: unknown,
+  index: number
+): TestimonialItem | null {
+  if (!item || typeof item !== "object") return null
+  const row = (item as Record<string, unknown>).testimonial ??
+    (item as Record<string, unknown>).review ??
+    item
+  const r = row as Record<string, unknown>
+  const text = String(
+    r.text ?? r["review-description"] ?? r.description ?? r.quote ?? ""
+  ).trim()
+  const name = String(
+    r.name ?? r["review-user-name"] ?? r.author ?? r["user-name"] ?? ""
+  ).trim()
+  if (!text || !name) return null
+  const ratingRaw = r.rating ?? r["review-rating"]
+  const rating =
+    ratingRaw != null && ratingRaw !== ""
+      ? parseFloat(String(ratingRaw))
+      : undefined
+  return {
+    id: String(r.id ?? `review-${index}`),
+    text,
+    name,
+    rating: Number.isFinite(rating) ? rating : undefined,
+    avatar: (r.avatar ?? r["review-profile-image"] ?? r.image) as string | undefined,
   }
 }
 
-export const getTestimonialsFromConfig = async (): Promise<{ title: string; testimonials: Array<{ id: string; text: string; name: string; rating: number; avatar?: string }> } | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const homepageConfig = config?.["homepage-config"]
-
-    if (!homepageConfig) return null
-
-    const block = await getMergedSectionBlock("testimonials")
-    const copy = parseSectionCopy(block)
-    const title = copy.title ?? copy.name ?? ""
-    const ratings = homepageConfig["ratings"] || []
-
-    let testimonials = (Array.isArray(ratings) ? ratings : []).map(
-      (item: unknown, index: number) => {
-        const row = item as Record<string, unknown>
-        const review = (row?.review ?? row) as Record<string, unknown>
-        return {
-          id: `review-${index}`,
-          text: String(review?.["review-description"] ?? "").trim(),
-          name: String(review?.["review-user-name"] ?? "").trim(),
-          rating: parseFloat(String(review?.["review-rating"] ?? "5")),
-          avatar: review?.["review-profile-image"] as string | undefined,
-        }
-      }
-    ).filter((t) => t.text && t.name)
-
-    return { title, testimonials }
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.testimonials
-    const copy = parseSectionCopy(block)
-    return { title: copy.title ?? copy.name ?? "", testimonials: [] }
-  }
+function parseTestimonialsFromBlock(block: Record<string, unknown>): TestimonialItem[] {
+  const raw =
+    block.items ??
+    block.testimonials ??
+    block.reviews ??
+    block["testimonial-items"] ??
+    []
+  if (!Array.isArray(raw)) return []
+  return raw
+    .map((item, index) => parseTestimonialRow(item, index))
+    .filter((t): t is TestimonialItem => t !== null)
 }
 
-export const getSocialLinksFromConfig = async (): Promise<Array<{ name: string; url: string; icon?: string }> | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const socialLinksRaw = config?.["homepage-config"]?.["social-links"] || []
-
-    const socialLinks = socialLinksRaw.map((item: any) => {
-      const link = item?.["social-link"] || item
-      return {
-        name: link?.["social-platform-name"] || "",
-        url: link?.["social-platform-url"] || "",
-        icon: link?.["social-platform-icon"] || undefined,
-      }
-    }).filter((l: any) => l.name && l.url)
-
-
-    return socialLinks.length > 0 ? socialLinks : null
-  } catch (error) {
+function parseRatingsFromHomepage(
+  ratings: unknown
+): TestimonialItem[] {
+  if (!Array.isArray(ratings)) return []
+  return ratings
+    .map((item, index) => parseTestimonialRow(item, index))
+    .filter((t): t is TestimonialItem => t !== null)
+}
 
-    return null
+export function getTestimonialsFromPageInput(
+  pageInput?: HomepageConfig | null
+): {
+  title: string
+  subtitle: string | null
+  testimonials: TestimonialItem[]
+} {
+  const homepageConfig = resolvePageInput(pageInput)
+  const block = getMergedSectionBlock("testimonials", pageInput)
+  const copy = parseSectionCopy(block)
+  const title = copy.title ?? copy.name ?? ""
+  const subtitle = (copy.description ?? copy.text ?? null) as string | null
+  let testimonials = parseTestimonialsFromBlock(block)
+  if (testimonials.length === 0) {
+    testimonials = parseRatingsFromHomepage(homepageConfig["ratings"])
+  }
+  if (testimonials.length === 0) {
+    testimonials = parseTestimonialsFromBlock(
+      DEFAULT_HOMEPAGE_SECTIONS.testimonials as Record<string, unknown>
+    )
   }
+  return { title, subtitle, testimonials }
 }
 
-export const getFaqsFromConfig = async (): Promise<Array<{ category: string; items: Array<{ q: string; a: string }> }> | null> => {
-  try {
-    const config = await getDynamicConfig()
-    const faqsRaw = config?.["homepage-config"]?.["faq-array"] || []
-
-    if (!Array.isArray(faqsRaw) || faqsRaw.length === 0) return null
-
-    const categoriesMap: Record<string, { displayCategory: string, items: Array<{q: string; a: string}> }> = {}
 
-    faqsRaw.forEach((item: any) => {
-      const faq = item?.["faq"] || item
-      const displayCategory = (faq?.["faq-category"] || "General Questions").trim()
-      const categoryKey = displayCategory.toLowerCase()
-      const q = (faq?.["faq-question"] || "").trim()
-      const a = (faq?.["faq-answer"] || "").trim()
-
-      if (q && a) {
-        if (!categoriesMap[categoryKey]) categoriesMap[categoryKey] = { displayCategory, items: [] }
-        categoriesMap[categoryKey].items.push({ q, a })
+export function getSocialLinksFromPageInput(
+  pageInput?: HomepageConfig | null
+): Array<{ name: string; url: string; icon?: string }> | null {
+  const config = resolvePageInput(pageInput)
+  const socialLinksRaw = config["social-links"] || []
+  const socialLinks = socialLinksRaw
+    .map((item: Record<string, unknown>) => {
+      const link = (item?.["social-link"] || item) as Record<string, unknown>
+      return {
+        name: String(link?.["social-platform-name"] || ""),
+        url: String(link?.["social-platform-url"] || ""),
+        icon: link?.["social-platform-icon"] as string | undefined,
       }
     })
+    .filter((l) => l.name && l.url)
+  return socialLinks.length > 0 ? socialLinks : null
+}
+
+
+export function getFaqsFromPageInput(
+  pageInput?: HomepageConfig | null
+): Array<{ category: string; items: Array<{ q: string; a: string }> }> | null {
+  const config = resolvePageInput(pageInput)
+  const faqsRaw = config["faq-array"] || []
+  if (!Array.isArray(faqsRaw) || faqsRaw.length === 0) return null
+  const categoriesMap: Record<
+    string,
+    { displayCategory: string; items: Array<{ q: string; a: string }> }
+  > = {}
+  faqsRaw.forEach((item: Record<string, unknown>) => {
+    const faq = (item?.["faq"] || item) as Record<string, unknown>
+    const displayCategory = String(faq?.["faq-category"] || "General Questions").trim()
+    const categoryKey = displayCategory.toLowerCase()
+    const q = String(faq?.["faq-question"] || "").trim()
+    const a = String(faq?.["faq-answer"] || "").trim()
+    if (q && a) {
+      if (!categoriesMap[categoryKey]) {
+        categoriesMap[categoryKey] = { displayCategory, items: [] }
+      }
+      categoriesMap[categoryKey].items.push({ q, a })
+    }
+  })
+  const faqs = Object.values(categoriesMap).map((catData) => ({
+    category: catData.displayCategory,
+    items: catData.items,
+  }))
+  return faqs.length > 0 ? faqs : null
+}
 
-    const faqs = Object.values(categoriesMap).map(catData => ({
-      category: catData.displayCategory,
-      items: catData.items
-    }))
 
-    return faqs.length > 0 ? faqs : null
-  } catch (error) {
-    return null
-  }
-}
-export const getAnnouncementMessagesFromConfig = async (): Promise<string[]> => {
-  try {
-    const block = await getMergedSectionBlock("promoAnnouncements")
-    return parseAnnouncementMessages(block)
-  } catch {
-    return parseAnnouncementMessages(
-      DEFAULT_HOMEPAGE_SECTIONS.promoAnnouncements as Record<string, unknown>
-    )
-  }
+export function getAnnouncementMessagesFromPageInput(
+  pageInput?: HomepageConfig | null
+): string[] {
+  const block = getMergedSectionBlock("promoAnnouncements", pageInput)
+  return parseAnnouncementMessages(block)
 }
 
+
 export type AboutBrandConfig = {
   eyebrow: string
   title: string
@@ -703,93 +570,71 @@ export type AboutBrandConfig = {
   stats: Array<{ label: string; value: string }>
 }
 
-export const getAboutBrandFromConfig = async (): Promise<AboutBrandConfig> => {
-  try {
-    const config = await getDynamicConfig()
-    const merged = await getMergedSectionBlock("aboutBrand")
-    const legacy =
-      config?.["homepage-config"]?.["about-brand"] ??
-      config?.["homepage-config"]?.["who-we-are"]
-    const b = mergeSectionBlock(
-      merged,
-      legacy && typeof legacy === "object"
-        ? (legacy as Record<string, unknown>)
-        : null
-    )
-
-    const statsRaw = (b.stats ?? b["about-stats"] ?? []) as unknown[]
-    const stats = Array.isArray(statsRaw)
-      ? statsRaw
-          .map((s: unknown) => {
-            if (!s || typeof s !== "object") return null
-            const row = s as Record<string, unknown>
-            const label = String(row.label ?? row.name ?? "").trim()
-            const value = String(row.value ?? "").trim()
-            return label && value ? { label, value } : null
-          })
-          .filter(Boolean) as Array<{ label: string; value: string }>
-      : []
-
-    const copy = parseSectionCopy(b)
-    return {
-      eyebrow: copy.eyebrow ?? "",
-      title: copy.title ?? copy.name ?? "",
-      description: copy.description ?? copy.text ?? "",
-      readMoreHref: String(b.readMoreHref ?? b["read-more-link"] ?? "/about"),
-      stats,
-    }
-  } catch {
-    const b = DEFAULT_HOMEPAGE_SECTIONS.aboutBrand
-    const copy = parseSectionCopy(b)
-    return {
-      eyebrow: copy.eyebrow ?? "",
-      title: copy.title ?? copy.name ?? "",
-      description: copy.description ?? copy.text ?? "",
-      readMoreHref: String(b.readMoreHref ?? "/about"),
-      stats: (b.stats ?? []) as unknown as Array<{ label: string; value: string }>,
-    }
+export function getAboutBrandFromPageInput(
+  pageInput?: HomepageConfig | null
+): AboutBrandConfig {
+  const homepageConfig = resolvePageInput(pageInput)
+  const merged = getMergedSectionBlock("aboutBrand", pageInput)
+  const legacy =
+    homepageConfig["about-brand"] ?? homepageConfig["who-we-are"]
+  const b = mergeSectionBlock(
+    merged,
+    legacy && typeof legacy === "object"
+      ? (legacy as Record<string, unknown>)
+      : null
+  )
+  const statsRaw = (b.stats ?? b["about-stats"] ?? []) as unknown[]
+  const stats = Array.isArray(statsRaw)
+    ? statsRaw
+        .map((s: unknown) => {
+          if (!s || typeof s !== "object") return null
+          const row = s as Record<string, unknown>
+          const label = String(row.label ?? row.name ?? "").trim()
+          const value = String(row.value ?? "").trim()
+          return label && value ? { label, value } : null
+        })
+        .filter(Boolean) as Array<{ label: string; value: string }>
+    : []
+  const copy = parseSectionCopy(b)
+  return {
+    eyebrow: copy.eyebrow ?? "",
+    title: copy.title ?? copy.name ?? "",
+    description: copy.description ?? copy.text ?? "",
+    readMoreHref: String(b.readMoreHref ?? b["read-more-link"] ?? "/about"),
+    stats,
   }
 }
 
+
 export type BrandPillarConfig = {
   title: string
   description: string
   image?: string
+  href?: string
 }
 
-export const getBrandPillarsFromConfig = async (): Promise<{
-  sectionTitle: string
-  pillars: BrandPillarConfig[]
-}> => {
-  try {
-    const block = await getMergedSectionBlock("brandPillars")
-    const copy = parseSectionCopy(block)
-    const sectionTitle = copy.title ?? copy.name ?? ""
-    const raw = block.pillars ?? block["brand-pillars"] ?? []
-    const pillars = (Array.isArray(raw) ? raw : [])
-      .map((item: unknown) => {
-        if (!item || typeof item !== "object") return null
-        const row = (item as Record<string, unknown>)["pillar"] ?? item
-        const p = row as Record<string, unknown>
-        const title = String(p.title ?? p.name ?? "").trim()
-        const description = String(p.description ?? p.text ?? "").trim()
-        const image = (p.image ?? p.icon) as string | undefined
-        return title && description ? { title, description, image } : null
-      })
-      .filter(Boolean) as BrandPillarConfig[]
-
-    return { sectionTitle, pillars }
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.brandPillars
-    const copy = parseSectionCopy(block)
-    const raw = block.pillars ?? []
-    return {
-      sectionTitle: copy.title ?? copy.name ?? "",
-      pillars: [...(Array.isArray(raw) ? raw : [])] as BrandPillarConfig[],
-    }
-  }
+export function getBrandPillarsFromPageInput(
+  pageInput?: HomepageConfig | null
+): { sectionTitle: string; pillars: BrandPillarConfig[] } {
+  const block = getMergedSectionBlock("brandPillars", pageInput)
+  const copy = parseSectionCopy(block)
+  const sectionTitle = copy.title ?? copy.name ?? ""
+  const raw = block.pillars ?? block["brand-pillars"] ?? []
+  const pillars = (Array.isArray(raw) ? raw : [])
+    .map((item: unknown) => {
+      if (!item || typeof item !== "object") return null
+      const row = (item as Record<string, unknown>)["pillar"] ?? item
+      const p = row as Record<string, unknown>
+      const title = String(p.title ?? p.name ?? "").trim()
+      const description = String(p.description ?? p.text ?? "").trim()
+      const image = (p.image ?? p.icon) as string | undefined
+      return title && description ? { title, description, image } : null
+    })
+    .filter(Boolean) as BrandPillarConfig[]
+  return { sectionTitle, pillars }
 }
 
+
 export type BlogPostConfig = {
   title: string
   excerpt?: string
@@ -799,53 +644,49 @@ export type BlogPostConfig = {
   image?: string
 }
 
-export const getBlogPostsFromConfig = async (): Promise<BlogPostConfig[]> => {
-  try {
-    const block = await getMergedSectionBlock("blogPosts")
-    const raw = block.posts ?? block["blog-posts"] ?? block["blog-array"] ?? []
-    const posts = (Array.isArray(raw) ? raw : [])
-      .map((item: unknown) => {
-        if (!item || typeof item !== "object") return null
-        const row = (item as Record<string, unknown>)["blog"] ?? item
-        const b = row as Record<string, unknown>
-        const title = String(b.title ?? "").trim()
-        const href = String(b.href ?? b.link ?? b.url ?? "").trim()
-        if (!title || !href) return null
-        return {
-          title,
-          href,
-          excerpt: String(b.excerpt ?? b.description ?? "").trim() || undefined,
-          category: String(b.category ?? b.tag ?? "").trim() || undefined,
-          date: String(b.date ?? "").trim() || undefined,
-          image: (b.image ?? b.thumbnail) as string | undefined,
-        }
-      })
-      .filter(Boolean) as BlogPostConfig[]
-    return posts
-  } catch {
-    const block = DEFAULT_HOMEPAGE_SECTIONS.blogPosts
-    const raw = block.posts ?? []
-    return (Array.isArray(raw) ? raw : [])
-      .map((item: unknown) => {
-        if (!item || typeof item !== "object") return null
-        const b = item as Record<string, unknown>
-        const title = String(b.title ?? "").trim()
-        const href = String(b.href ?? b.link ?? "").trim()
-        if (!title || !href) return null
-        return { title, href } as BlogPostConfig
-      })
-      .filter(Boolean) as BlogPostConfig[]
-  }
+export function getBlogPostsFromPageInput(
+  pageInput?: HomepageConfig | null
+): BlogPostConfig[] {
+  const block = getMergedSectionBlock("blogPosts", pageInput)
+  const raw = block.posts ?? block["blog-posts"] ?? block["blog-array"] ?? []
+  return (Array.isArray(raw) ? raw : [])
+    .map((item: unknown) => {
+      if (!item || typeof item !== "object") return null
+      const row = (item as Record<string, unknown>)["blog"] ?? item
+      const b = row as Record<string, unknown>
+      const title = String(b.title ?? "").trim()
+      const href = String(b.href ?? b.link ?? b.url ?? "").trim()
+      if (!title || !href) return null
+      return {
+        title,
+        href,
+        excerpt: String(b.excerpt ?? b.description ?? "").trim() || undefined,
+        category: String(b.category ?? b.tag ?? "").trim() || undefined,
+        date: String(b.date ?? "").trim() || undefined,
+        image: (b.image ?? b.thumbnail) as string | undefined,
+      }
+    })
+    .filter(Boolean) as BlogPostConfig[]
 }
 
+
 function readPromoCountdownBlock(block: unknown): {
   code: string | null
   message: string | null
   endAt: string | null
   active: boolean | undefined
+  ctaLabel: string | null
+  ctaHref: string | null
 } {
   if (!block || typeof block !== "object") {
-    return { code: null, message: null, endAt: null, active: undefined }
+    return {
+      code: null,
+      message: null,
+      endAt: null,
+      active: undefined,
+      ctaLabel: null,
+      ctaHref: null,
+    }
   }
   const row = block as Record<string, unknown>
   const code =
@@ -856,52 +697,152 @@ function readPromoCountdownBlock(block: unknown): {
   const endAt = typeof endAtRaw === "string" && endAtRaw.trim() ? endAtRaw.trim() : null
   const activeRaw = row["promo-active"] ?? row.active
   const active = typeof activeRaw === "boolean" ? activeRaw : undefined
-  return { code, message, endAt, active }
+  const ctaLabel =
+    normalizeCmsText(row["cta-label"] ?? row.ctaLabel ?? row["button-label"]) ?? null
+  const ctaHref =
+    normalizeCmsText(row["cta-href"] ?? row.ctaHref ?? row["button-href"]) ?? null
+  return { code, message, endAt, active, ctaLabel, ctaHref }
 }
 
 /** Promo countdown — defaults + `sections.promoCountdown` override. */
-export const getPromoCountdownFromConfig = async (): Promise<{
+export function getPromoCountdownFromPageInput(
+  pageInput?: HomepageConfig | null
+): {
   code: string | null
   message: string | null
   endAt: string | null
   active: boolean
-}> => {
-  try {
-    const block = await getMergedSectionBlock("promoCountdown")
-    const fromBlock = readPromoCountdownBlock(block)
-    const defaults = readPromoCountdownBlock(DEFAULT_HOMEPAGE_SECTIONS.promoCountdown)
-
-    return {
-      code: fromBlock.code ?? defaults.code,
-      message: fromBlock.message ?? defaults.message,
-      endAt: fromBlock.endAt ?? defaults.endAt,
-      active: fromBlock.active ?? defaults.active ?? false,
-    }
-  } catch {
-    const defaults = readPromoCountdownBlock(DEFAULT_HOMEPAGE_SECTIONS.promoCountdown)
-    return {
-      code: defaults.code,
-      message: defaults.message,
-      endAt: defaults.endAt,
-      active: defaults.active ?? false,
-    }
+  ctaLabel: string | null
+  ctaHref: string | null
+} {
+  const block = getMergedSectionBlock("promoCountdown", pageInput)
+  const fromBlock = readPromoCountdownBlock(block)
+  const defaults = readPromoCountdownBlock(DEFAULT_HOMEPAGE_SECTIONS.promoCountdown)
+  return {
+    code: fromBlock.code ?? defaults.code,
+    message: fromBlock.message ?? defaults.message,
+    endAt: fromBlock.endAt ?? defaults.endAt,
+    active: fromBlock.active ?? defaults.active ?? false,
+    ctaLabel: fromBlock.ctaLabel ?? defaults.ctaLabel,
+    ctaHref: fromBlock.ctaHref ?? defaults.ctaHref,
   }
 }
 
-export { DEFAULT_HOMEPAGE_SECTIONS } from "./homepage-section-defaults"
 
-export const getPromoBarConfig = async (): Promise<{ text: string | null; code: string | null; value: string | null; active: boolean }> => {
-  try {
-    const config = await getDynamicConfig()
-    const promoConfig = config?.["homepage-config"]?.["promo-bar"]
+export type InstagramPostConfig = {
+  id: string
+  image: string
+  url?: string
+}
 
-    return {
-      text: normalizeCmsText(promoConfig?.["promo-text"]) || null,
-      code: promoConfig?.["promo-code"] || null,
-      value: promoConfig?.["promo-value"] || null,
-      active: promoConfig?.["promo-active"] ?? false,
-    }
-  } catch (error) {
-    return { text: null, code: null, value: null, active: false }
+export type InstagramPostsData = {
+  title: string
+  handle: string
+  profileUrl: string
+  profileImage?: string
+  posts: InstagramPostConfig[]
+}
+
+function parseInstagramPostRow(
+  item: unknown,
+  index: number
+): InstagramPostConfig | null {
+  if (!item || typeof item !== "object") return null
+  const row = (item as Record<string, unknown>).post ??
+    (item as Record<string, unknown>).instagram ??
+    item
+  const p = row as Record<string, unknown>
+  const image = String(p.image ?? p["post-image"] ?? p.thumbnail ?? p.src ?? "").trim()
+  if (!image) return null
+  const url = String(p.url ?? p.link ?? p.href ?? p["post-url"] ?? "").trim() || undefined
+  return {
+    id: String(p.id ?? `ig-${index}`),
+    image,
+    url,
   }
 }
+
+function parseInstagramPostsFromBlock(
+  block: Record<string, unknown>
+): InstagramPostConfig[] {
+  const raw =
+    block.posts ??
+    block.items ??
+    block["instagram-posts"] ??
+    block["posts-array"] ??
+    []
+  if (!Array.isArray(raw)) return []
+  return raw
+    .map((item, index) => parseInstagramPostRow(item, index))
+    .filter((p): p is InstagramPostConfig => p !== null)
+}
+
+/** Instagram feed — `sections.instagramPosts` + optional social-links fallback. */
+export function getInstagramPostsFromPageInput(
+  pageInput?: HomepageConfig | null
+): InstagramPostsData {
+  const defaultsBlock = DEFAULT_HOMEPAGE_SECTIONS.instagramPosts as Record<
+    string,
+    unknown
+  >
+  const defaultCopy = parseSectionCopy(defaultsBlock)
+  const defaultPosts = parseInstagramPostsFromBlock(defaultsBlock)
+  const block = getMergedSectionBlock("instagramPosts", pageInput)
+  const copy = parseSectionCopy(block)
+  let posts = parseInstagramPostsFromBlock(block)
+  if (posts.length === 0) posts = defaultPosts
+  const handle =
+    normalizeCmsText(
+      block.handle ??
+        block.username ??
+        block["instagram-handle"] ??
+        defaultsBlock.handle
+    ) ?? "yourbrand"
+  const profileUrl =
+    normalizeCmsText(
+      block["profile-url"] ??
+        block.profileUrl ??
+        block["instagram-url"] ??
+        defaultsBlock["profile-url"]
+    ) ?? `https://www.instagram.com/${handle.replace(/^@/, "")}/`
+  const profileImage =
+    (block["profile-image"] ??
+      block.profileImage ??
+      defaultsBlock["profile-image"]) as string | undefined
+  return {
+    title:
+      copy.title ?? copy.name ?? defaultCopy.title ?? "Follow Us on Instagram",
+    handle,
+    profileUrl,
+    profileImage,
+    posts,
+  }
+}
+
+
+export {
+  DEFAULT_HOMEPAGE_SECTIONS,
+  type DefaultHomeSectionId,
+} from "./homepage-section-defaults"
+export type {
+  DynamicConfigResponse,
+  HomepageConfig,
+  HomepageSectionsConfig,
+  HomepageSectionId,
+  HomepageSectionCopyFields,
+  HomepageNewArrivalsSection,
+} from "./homepage-config.types"
+export { HOMEPAGE_SECTION_IDS } from "./homepage-config.types"
+
+export function getPromoBarFromPageInput(
+  pageInput?: HomepageConfig | null
+): { text: string | null; code: string | null; value: string | null; active: boolean } {
+  const config = resolvePageInput(pageInput)
+  const promoConfig = config["promo-bar"]
+  const text = normalizeCmsText(promoConfig?.["promo-text"]) ?? null
+  const code = normalizeCmsText(promoConfig?.["promo-code"]) ?? null
+  const value = normalizeCmsText(promoConfig?.["promo-value"]) ?? null
+  const active = Boolean(promoConfig?.["promo-active"])
+  return { text, code, value, active }
+}
+