medusa-storefront-data 2.3.0 → 2.5.1

package/src/server/cart.ts

@@ -55,7 +55,7 @@ import {
   medusaCustomerUpdateAddress,
 } from "medusa-services/customer"
 import { medusaPaymentSessionInitiate } from "medusa-services/payment"
-import { getStoreCartClientOptions } from "../util/store-client"
+import { getStoreClientOptions } from "../util/store-client"
 import { revalidateCartTags } from "../util/revalidate-cart"
 
 import { cache } from "react"
@@ -86,7 +86,7 @@ export const retrieveCart = cache(
         
         // Skip metadata check if we are clearly in checkout to avoid extra API call
         if (!pathname.includes("/checkout")) {
-          const options = await getStoreCartClientOptions()
+          const options = await getStoreClientOptions()
           const currentCart = await medusaCartRetrieve(id, options, { fields: "metadata" })
             .then(({ cart }) => cart)
             .catch(() => null)
@@ -143,7 +143,7 @@ export async function getOrSetCart(countryCode: string) {
   }
 
   let cart = await retrieveCart(undefined, "id,region_id")
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
 
   if (!cart) {
     const locale = await getLocale()
@@ -176,7 +176,7 @@ export async function updateCart(data: HttpTypes.StoreUpdateCart) {
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { cart } = await medusaCartUpdate(cartId, data as Record<string, unknown>, options)
     await revalidateCartTags()
     return cart as unknown as HttpTypes.StoreCart
@@ -205,7 +205,7 @@ export async function addToCart({
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartAddLineItem(cart.id, { variant_id: variantId, quantity }, options)
     await revalidateCartTags()
   } catch (e) {
@@ -232,7 +232,7 @@ export async function buyNow({
     throw new Error(`Region not found for country code: ${countryCode}`)
   }
 
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   const locale = await getLocale()
   
   // 1. Create a NEW cart regardless of existing one
@@ -343,7 +343,7 @@ export async function updateLineItem({
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartUpdateLineItem(cartId, lineId, { quantity }, options)
     await revalidateCartTags()
   } catch (e) {
@@ -363,7 +363,7 @@ export async function deleteLineItem(lineId: string) {
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartRemoveLineItem(cartId, lineId, options)
     await revalidateCartTags()
   } catch (e) {
@@ -409,7 +409,7 @@ export async function setShippingMethod({
   shippingMethodId: string
 }) {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartAddShippingMethod(cartId, shippingMethodId, options)
     const cartCacheTag = await getCacheTag("carts")
     revalidateTag(cartCacheTag)
@@ -429,7 +429,7 @@ export async function setShippingMethodSilently({
   shippingMethodId: string
 }) {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartAddShippingMethod(cartId, shippingMethodId, options)
     return { success: true }
   } catch (e) {
@@ -490,13 +490,13 @@ export async function initiatePaymentSession(
     }
 
     if (Object.keys(addressUpdates).length > 0) {
-      const options = await getStoreCartClientOptions()
+      const options = await getStoreClientOptions()
       await medusaCartUpdate(latestCart.id, addressUpdates, options)
     }
   }
 
   // 3. Final re-fetch (direct call to bypass any lib-level cache)
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   const { cart: finalCartRaw } = await medusaCartRetrieve(cart.id, options, {
     fields: "*shipping_address,*billing_address",
   })
@@ -552,7 +552,7 @@ export async function applyPromotions(codes: string[]) {
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { cart } = await medusaCartApplyPromotions(cartId, codes, options)
     await revalidateCartTags()
     return cart as unknown as HttpTypes.StoreCart
@@ -668,7 +668,7 @@ export async function setAddresses(currentState: unknown, formData: FormData) {
     const authHeaders = await getAuthHeaders()
     if (authHeaders && "authorization" in authHeaders) {
       try {
-        const options = await getStoreCartClientOptions()
+        const options = await getStoreClientOptions()
         const { customer } = await medusaCustomerRetrieve(options, { fields: "*addresses" })
 
         const addressExists = customer?.addresses?.some((a: any) =>
@@ -731,7 +731,7 @@ export async function placeOrder(cartId?: string) {
 
   let cartRes
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     cartRes = await medusaCartComplete(id, options)
     const cartCacheTag = await getCacheTag("carts")
     revalidateTag(cartCacheTag)
@@ -840,7 +840,7 @@ export async function addCustomerAddressToCart(currentState: unknown, formData:
     // 1. Add/Update Customer Address Book
     // We try/catch this separately so if it fails (e.g. user not logged in), we still try to proceed with checkout
     try {
-      const options = await getStoreCartClientOptions()
+      const options = await getStoreClientOptions()
       if (addressId) {
         await medusaCustomerUpdateAddress(addressId, addressData, options)
       } else {
@@ -916,7 +916,7 @@ export async function updateAddressSilently(data: any) {
       }
     }
 
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartUpdate(cartId, payload, options)
     
     // Revalidate tags to ensure CartTotals gets new shipping info
@@ -935,7 +935,7 @@ export async function updateCartMetadataSilently(metadata: any) {
   if (!cartId) return
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartUpdate(cartId, { metadata }, options)
     // We intentionally DO NOT call revalidateTag here to prevent page refresh loops
     return { success: true }
@@ -953,7 +953,7 @@ export async function getAbandonedCarts() {
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const res = await medusaCartList(options, {
       fields: "*items, *items.product, *items.product.thumbnail, *items.variant, *items.metadata, +total",
     }).catch(() => null)
@@ -989,7 +989,7 @@ export async function resumeAbandonedCart(cartId: string, countryCode: string) {
 
 export async function deleteCart(cartId: string) {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCartDelete(cartId, options)
     
     revalidateTag("carts")

package/src/server/config-merge.ts

@@ -0,0 +1,31 @@
+/** 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
+}

package/src/server/customer.ts

@@ -33,7 +33,7 @@ import { medusaCartMerge, medusaCartTransfer } from "medusa-services/cart"
 import {
   getAuthClientOptions,
   getMedusaBackendUrl,
-  getStoreCartClientOptions,
+  getStoreClientOptions,
 } from "../util/store-client"
 
 import { cache } from "react"
@@ -52,7 +52,7 @@ export const retrieveCustomer = cache(
     if (!("authorization" in authHeaders)) return null
 
     try {
-      const options = await getStoreCartClientOptions()
+      const options = await getStoreClientOptions()
       const { customer } = await medusaCustomerRetrieve(options, { fields: "*addresses" })
       return customer as unknown as HttpTypes.StoreCustomer
     } catch (error: unknown) {
@@ -68,7 +68,7 @@ export const retrieveCustomer = cache(
 
 export const updateCustomer = async (body: HttpTypes.StoreUpdateCustomer) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { customer } = await medusaCustomerUpdate(body as Record<string, unknown>, options)
 
     const cacheTag = await getCacheTag("customers")
@@ -98,7 +98,7 @@ export async function signup(_currentState: unknown, formData: FormData) {
 
     await setAuthToken(token)
 
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     const { customer: createdCustomer } = await medusaCustomerCreate(customerForm, options)
 
     const loginToken = await medusaAuthLogin(
@@ -142,7 +142,7 @@ export async function login(
     cookieStore.set("_medusa_customer_email", email, { maxAge: 60 * 60 * 24 * 7, path: "/" })
 
     try {
-      const options = await getStoreCartClientOptions()
+      const options = await getStoreClientOptions()
       await medusaCustomerRetrieve({
         ...options,
         authorization: `Bearer ${token}`,
@@ -219,7 +219,7 @@ export async function signout(countryCode: string) {
 
 export async function transferCart(token?: string) {
   const cartId = await getCartId()
-  const options = await getStoreCartClientOptions()
+  const options = await getStoreClientOptions()
   const mergeOptions = token
     ? { ...options, authorization: `Bearer ${token}` }
     : options
@@ -285,7 +285,7 @@ export const addCustomerAddress = async (
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCustomerCreateAddress(address, options)
 
     const customerCacheTag = await getCacheTag("customers")
@@ -300,7 +300,7 @@ export const deleteCustomerAddress = async (
   addressId: string
 ): Promise<void> => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCustomerDeleteAddress(addressId, options)
 
     const customerCacheTag = await getCacheTag("customers")
@@ -344,7 +344,7 @@ export const updateCustomerAddress = async (
   }
 
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCustomerUpdateAddress(addressId, address, options)
 
     const customerCacheTag = await getCacheTag("customers")
@@ -357,7 +357,7 @@ export const updateCustomerAddress = async (
 
 export const setDefaultAddress = async (addressId: string) => {
   try {
-    const options = await getStoreCartClientOptions()
+    const options = await getStoreClientOptions()
     await medusaCustomerUpdateAddress(addressId, { is_default_shipping: true }, options)
 
     const customerCacheTag = await getCacheTag("customers")
@@ -469,7 +469,7 @@ export async function handleGoogleCallback(token: string, email?: string, first_
       const cookieStore = await cookies()
       cookieStore.set("_medusa_customer_email", email, { maxAge: 60 * 60 * 24 * 7, path: "/" })
 
-      const options = await getStoreCartClientOptions()
+      const options = await getStoreClientOptions()
       if (options.authorization) {
         try {
           await medusaCustomerCreate(