medusa-storefront-data 2.4.0 → 2.5.1

package/src/server/normalize-homepage-config.ts

@@ -0,0 +1,240 @@
+import type { HomepageConfig } from "./homepage-config.types"
+
+type Loose = Record<string, unknown>
+
+function asObject(v: unknown): Loose | null {
+  return v && typeof v === "object" && !Array.isArray(v) ? (v as Loose) : null
+}
+
+function asArray(v: unknown): unknown[] {
+  return Array.isArray(v) ? v : []
+}
+
+/** Map simplified banner row → legacy `homepage-banner` / `app-banner` entry. */
+function legacyBannerEntry(
+  row: unknown,
+  prefix: "homepage-banner" | "app-banner"
+): Loose | null {
+  const r = asObject(row)
+  if (!r) return null
+  const image = r.image ?? r[`${prefix}-image`]
+  if (!image) return null
+  return {
+    [prefix]: {
+      [`${prefix}-image`]: image,
+      [`${prefix}-title`]: r.title ?? r[`${prefix}-title`],
+      [`${prefix}-subtitle`]: r.subtitle ?? r[`${prefix}-subtitle`],
+      [`${prefix}-description`]: r.description ?? r[`${prefix}-description`],
+      [`${prefix}-button-name`]: r.buttonText ?? r.buttonName ?? r[`${prefix}-button-name`],
+      [`${prefix}-button-link`]: r.buttonLink ?? r[`${prefix}-button-link`],
+      ...(prefix === "app-banner" && r.link != null
+        ? { "app-banner-link": r.link }
+        : {}),
+    },
+  }
+}
+
+function normalizeBanners(site: Loose | null): {
+  desktop: Loose[]
+  mobile: Loose[]
+} {
+  const banners = asObject(site?.banners) ?? asObject(site)
+  const desktopRaw =
+    banners?.desktop ?? banners?.["homepage-banner-array"] ?? site?.["homepage-banner-array"]
+  const mobileRaw = banners?.mobile ?? banners?.["app-banner-array"] ?? site?.["app-banner-array"]
+
+  const desktop = asArray(desktopRaw)
+    .map((row) => legacyBannerEntry(row, "homepage-banner"))
+    .filter(Boolean) as Loose[]
+
+  const mobile = asArray(mobileRaw)
+    .map((row) => legacyBannerEntry(row, "app-banner"))
+    .filter(Boolean) as Loose[]
+
+  return { desktop, mobile }
+}
+
+function normalizeContact(site: Loose | null): Loose | undefined {
+  const c = asObject(site?.contact) ?? asObject(site?.["contact-us"])
+  if (!c) return undefined
+  return {
+    "contact-phone": c.phone ?? c["contact-phone"],
+    "contact-email": c.email ?? c["contact-email"],
+    "contact-whatsapp": c.whatsapp ?? c["contact-whatsapp"],
+    "contact-address": c.address ?? c["contact-address"],
+  }
+}
+
+function normalizeSocial(site: Loose | null): Loose[] {
+  const raw = site?.social ?? site?.["social-links"]
+  return asArray(raw).map((item) => {
+    const row = asObject((item as Loose)?.["social-link"]) ?? asObject(item)
+    if (!row) return null
+    return {
+      "social-link": {
+        "social-platform-name": row.name ?? row["social-platform-name"],
+        "social-platform-url": row.url ?? row["social-platform-url"],
+        "social-platform-icon": row.icon ?? row["social-platform-icon"],
+      },
+    }
+  }).filter(Boolean) as Loose[]
+}
+
+function normalizeFaqs(site: Loose | null): Loose[] {
+  const raw = site?.faqs ?? site?.["faq-array"]
+  return asArray(raw).map((item) => {
+    const f = asObject((item as Loose)?.faq) ?? asObject(item)
+    if (!f) return null
+    return {
+      faq: {
+        "faq-category": f.category ?? f["faq-category"],
+        "faq-question": f.question ?? f["faq-question"],
+        "faq-answer": f.answer ?? f["faq-answer"],
+      },
+    }
+  }).filter(Boolean) as Loose[]
+}
+
+function normalizeTestimonialItem(item: unknown): Loose | null {
+  const r = asObject((item as Loose)?.testimonial) ?? asObject(item)
+  if (!r) return null
+  const text = String(r.text ?? r.description ?? "").trim()
+  const name = String(r.name ?? "").trim()
+  if (!text || !name) return null
+  return { text, name, avatar: r.avatar, rating: r.rating }
+}
+
+function normalizeSections(sections: Loose): Loose {
+  const out: Loose = { ...sections }
+
+  const promoAnnouncements = asObject(sections.promoAnnouncements)
+  if (promoAnnouncements?.messages) {
+    const messages = asArray(promoAnnouncements.messages)
+      .map((m) => {
+        if (typeof m === "string") return m.trim()
+        const row = asObject(m)
+        return String(row?.message ?? row?.text ?? "").trim()
+      })
+      .filter(Boolean)
+    out.promoAnnouncements = { ...promoAnnouncements, messages }
+  }
+
+  const testimonials = asObject(sections.testimonials)
+  if (testimonials) {
+    const items =
+      testimonials.items ??
+      testimonials.testimonials ??
+      testimonials.reviews
+    if (Array.isArray(items)) {
+      out.testimonials = {
+        ...testimonials,
+        items: items.map(normalizeTestimonialItem).filter(Boolean),
+      }
+    }
+  }
+
+  const promo = asObject(sections.promoCountdown)
+  if (promo) {
+    out.promoCountdown = {
+      code: promo.code ?? promo["promo-code"],
+      text: promo.text ?? promo.message ?? promo["promo-text"],
+      "end-at": promo.endAt ?? promo["end-at"],
+      active: promo.active ?? promo["promo-active"],
+      "cta-label": promo.ctaLabel ?? promo["cta-label"],
+      "cta-href": promo.ctaHref ?? promo["cta-href"],
+    }
+  }
+
+  const baptism = asObject(sections.baptismPicks)
+  if (baptism?.looks) {
+    out.baptismPicks = {
+      title: baptism.title,
+      looks: asArray(baptism.looks).map((look) => {
+        const L = asObject((look as Loose)?.look) ?? asObject(look)
+        if (!L) return null
+        return {
+          image: L.image,
+          "product-ids": L.productIds ?? L["product-ids"],
+          "product-handles": L.productHandles ?? L["product-handles"],
+        }
+      }).filter(Boolean),
+    }
+  }
+
+  const ig = asObject(sections.instagramPosts)
+  if (ig) {
+    out.instagramPosts = {
+      title: ig.title,
+      handle: ig.handle,
+      "profile-url": ig.profileUrl ?? ig["profile-url"],
+      "profile-image": ig.profileImage ?? ig["profile-image"],
+      posts: asArray(ig.posts).map((p) => {
+        const row = asObject((p as Loose)?.post) ?? asObject(p)
+        return row ? { image: row.image, url: row.url ?? row.link } : null
+      }).filter(Boolean),
+    }
+  }
+
+  const about = asObject(sections.aboutBrand)
+  if (about) {
+    out.aboutBrand = {
+      eyebrow: about.eyebrow,
+      title: about.title,
+      description: about.description ?? about.text,
+      readMoreHref: about.readMoreHref ?? about["read-more-link"],
+      stats: about.stats,
+    }
+  }
+
+  // brandPillars: title only in simplified CMS (cards from categories in storefront)
+  const pillars = asObject(sections.brandPillars)
+  if (pillars && !pillars.pillars) {
+    out.brandPillars = {
+      title: pillars.title,
+      description: pillars.description,
+    }
+  }
+
+  return out
+}
+
+/**
+ * Accepts simplified `homepage-config` (site / banners / sections) or legacy shape.
+ * Storefront always receives the legacy `HomepageConfig` it already parses.
+ */
+export function normalizeHomepageConfig(input: unknown): HomepageConfig {
+  if (!input || typeof input !== "object") return {}
+
+  const raw = input as Loose
+  const site = asObject(raw.site)
+  const hasSimplifiedSite = Boolean(site)
+
+  if (!hasSimplifiedSite) {
+    return raw as HomepageConfig
+  }
+
+  const { desktop, mobile } = normalizeBanners(raw)
+  const sections = normalizeSections(asObject(raw.sections) ?? {})
+
+  const legacy: HomepageConfig = {
+    logo: (site?.logo as string) ?? (raw.logo as string),
+    "website-description":
+      (site?.description as string) ??
+      (raw["website-description"] as string),
+    sections: sections as HomepageConfig["sections"],
+  }
+
+  if (desktop.length) legacy["homepage-banner-array"] = desktop as never
+  if (mobile.length) legacy["app-banner-array"] = mobile as never
+
+  const contact = normalizeContact(site)
+  if (contact) legacy["contact-us"] = contact as never
+
+  const social = normalizeSocial(site)
+  if (social.length) legacy["social-links"] = social as never
+
+  const faqs = normalizeFaqs(site)
+  if (faqs.length) legacy["faq-array"] = faqs as never
+
+  return legacy
+}

package/src/server/orders.ts

@@ -32,7 +32,7 @@ import {
 } from "medusa-services/cart"
 import {
   getGuestStoreClientOptions,
-  getStoreCartClientOptions,
+  getStoreClientOptions,
   getStoreClientOptionsWithToken,
 } from "../util/store-client"
 
@@ -63,7 +63,7 @@ export const retrieveOrder = async (id: string) => {
       return order as unknown as HttpTypes.StoreOrder
     }
 
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { order } = await medusaOrderRetrieve(id, options, {
       fields: MEDUSA_ORDER_DETAIL_FIELDS,
     })
@@ -79,7 +79,7 @@ export const listOrders = async (
   filters?: Record<string, any>
 ) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { orders } = await medusaOrderList(options, {
       limit,
       offset,
@@ -111,7 +111,7 @@ export const createTransferRequest = async (
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { order } = await medusaOrderRequestTransfer(id, options, {
       fields: "id, email",
     })
@@ -127,7 +127,7 @@ export const createTransferRequest = async (
 
 export const acceptTransferRequest = async (id: string, token: string) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { order } = await medusaOrderAcceptTransfer(id, token, options)
     return {
       success: true,
@@ -141,7 +141,7 @@ export const acceptTransferRequest = async (id: string, token: string) => {
 
 export const declineTransferRequest = async (id: string, token: string) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { order } = await medusaOrderDeclineTransfer(id, token, options)
     return {
       success: true,

package/src/server/page-input.ts

@@ -3,6 +3,7 @@ import "server-only"
 import defaultPageInputJson from "../../segment-data/default-page-input.json"
 import type { HomepageConfig } from "./homepage-config.types"
 import { mergeSectionBlock } from "./config-merge"
+import { normalizeHomepageConfig } from "./normalize-homepage-config"
 
 /** Full `homepage-config` blob passed from the main project into pages and layout. */
 export type StorefrontPageInput = HomepageConfig
@@ -60,5 +61,6 @@ export function resolvePageInput(
 export function homepageConfigFromDynamicResponse(
   response: { "homepage-config"?: HomepageConfig | null } | null | undefined
 ): StorefrontPageInput {
-  return mergePageInputWithDefaults(response?.["homepage-config"] ?? null)
+  const normalized = normalizeHomepageConfig(response?.["homepage-config"] ?? null)
+  return mergePageInputWithDefaults(normalized)
 }

package/src/server/payment-details.ts

@@ -6,11 +6,11 @@ import {
   medusaPaymentDetailMakeDefault,
   medusaPaymentDetailsList,
 } from "medusa-services/payment"
-import { getStoreCartClientOptions } from "../util/store-client"
+import { getStoreClientOptions } from "../util/store-client"
 
 export const listPaymentDetails = async () => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     if (!options.authorization) {
       return []
     }
@@ -26,16 +26,16 @@ export const createPaymentDetail = async (
   type: "upi" | "bank" | "card",
   detail_json: Record<string, string>
 ) => {
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   return medusaPaymentDetailCreate(type, detail_json, options)
 }
 
 export const makeDefaultPaymentDetail = async (id: string) => {
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   return medusaPaymentDetailMakeDefault(id, options)
 }
 
 export const deletePaymentDetail = async (id: string) => {
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   return medusaPaymentDetailDelete(id, options)
 }

package/src/server/payment.ts

@@ -2,11 +2,11 @@
 
 import { HttpTypes } from "@medusajs/types"
 import { medusaPaymentProvidersList } from "medusa-services/payment"
-import { getStoreCartClientOptions } from "../util/store-client"
+import { getStoreClientOptions } from "../util/store-client"
 
 export const listCartPaymentMethods = async (regionId: string) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { payment_providers } = await medusaPaymentProvidersList(regionId, options)
     return payment_providers.sort((a, b) => (a.id > b.id ? 1 : -1)) as HttpTypes.StorePaymentProvider[]
   } catch {

package/src/server/regions.ts

@@ -6,7 +6,7 @@ import medusaError from "../util/medusa-error"
 import { HttpTypes } from "@medusajs/types"
 import { getCacheOptions } from "../cookies"
 import { medusaRegionList } from "medusa-services/regions"
-import { getStoreCartClientOptions } from "../util/store-client"
+import { getStoreClientOptions } from "../util/store-client"
 
 export const listRegions = async () => {
   const next = {
@@ -46,7 +46,7 @@ export const getRegion = async (countryCode: string) => {
       return regionMap.get(countryCode)
     }
 
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { regions } = await medusaRegionList(options)
 
     if (!regions?.length) {

package/src/server/shoppable-looks.ts

@@ -116,7 +116,7 @@ async function fetchProductsForLook(
     if (p) ordered.push(p)
   }
   for (const handle of productHandles) {
-    const p = [...byId.values()].find((x) => x.handle === handle)
+    const p = Array.from(byId.values()).find((x) => x.handle === handle)
     if (p && !ordered.some((o) => o.id === p.id)) ordered.push(p)
   }
 

package/src/util/store-client.ts

@@ -37,9 +37,6 @@ export async function getStoreClientOptions(): Promise<MedusaStoreClientOptions>
   }
 }
 
-/** @deprecated Use getStoreClientOptions */
-export const getStoreCartClientOptions = getStoreClientOptions
-
 export function getMedusaBackendUrl(): string {
   return getBackendUrl()
 }