@ecomiq/storefront 2.0.22 → 2.1.3

package/src/components/checkout/use-checkout-session.ts

@@ -13,7 +13,6 @@ import type {
   StorefrontCart,
   StorefrontOrderBump,
 } from '@ecomiq/core'
-import { cartVariantIdFromProduct } from '@ecomiq/core'
 import { useCart } from '../../providers'
 import { serverApi } from '../../server'
 import {
@@ -33,7 +32,7 @@ type ShippingFlat = {
   rate: ShippingRate
 }
 
-export function useCheckoutSession(cartId: string) {
+export function useCheckoutSession(cartToken: string) {
   const { cart: providerCart, clearCart, reload: reloadProviderCart } = useCart()
 
   const [checkoutCart, setCheckoutCart] = useState<StorefrontCart | null>(null)
@@ -90,7 +89,7 @@ export function useCheckoutSession(cartId: string) {
     setLoadStatus('loading')
     setLoadError(undefined)
     try {
-      const data = await serverApi.getCartCheckout({ cartId })
+      const data = await serverApi.getCartCheckout({ cartToken })
       if (isCheckoutCartAlreadyPurchased(data.cart)) {
         setCheckoutAlreadyPurchased(true)
         clearCart()
@@ -109,7 +108,7 @@ export function useCheckoutSession(cartId: string) {
       )
       setLoadStatus('error')
     }
-  }, [cartId, clearCart])
+  }, [cartToken, clearCart])
 
   useEffect(() => {
     hydratedRef.current = false
@@ -124,7 +123,7 @@ export function useCheckoutSession(cartId: string) {
     setCheckoutPaymentMethodCode(null)
     setDeliveryPersisted(false)
     void loadCheckout()
-  }, [cartId, loadCheckout])
+  }, [cartToken, loadCheckout])
 
   useEffect(() => {
     if (!checkoutCart || hydratedRef.current) return
@@ -150,7 +149,7 @@ export function useCheckoutSession(cartId: string) {
   // Cross-tab: sesión de carrito o ítems del provider cambian tras baseline.
   useEffect(() => {
     if (loadStatus !== 'ready' || isReconciling || checkoutAlreadyPurchased) return
-    const sig = cartSessionSignature(cartId, localItems)
+    const sig = cartSessionSignature(cartToken, localItems)
     if (baselineSigRef.current === null) {
       baselineSigRef.current = sig
       return
@@ -158,7 +157,7 @@ export function useCheckoutSession(cartId: string) {
     if (sig !== baselineSigRef.current) {
       setCartChangedExternally(true)
     }
-  }, [cartId, checkoutAlreadyPurchased, isReconciling, loadStatus, localItems])
+  }, [cartToken, checkoutAlreadyPurchased, isReconciling, loadStatus, localItems])
 
   useEffect(() => {
     const key = `ecomiq:cart:v1:`
@@ -174,14 +173,14 @@ export function useCheckoutSession(cartId: string) {
   useEffect(() => {
     if (loadStatus !== 'ready' || !checkoutCart || checkoutAlreadyPurchased) return
     if (isReconcilingRef.current) return
-    if (providerCart && providerCart.id !== cartId) return
+    if (providerCart && providerCart.token !== cartToken) return
     if (localItems.length === 0 && apiItems.length === 0) return
     if (areCartSignaturesEqual(localItems, apiItems)) return
 
     const actions = findCartReconciliationActions(localItems, apiItems)
     if (actions.length === 0) return
 
-    const attemptKey = `${cartId}::${cartItemsSignature(localItems)}::${cartItemsSignature(apiItems)}`
+    const attemptKey = `${cartToken}::${cartItemsSignature(localItems)}::${cartItemsSignature(apiItems)}`
     if (reconcileAttemptRef.current === attemptKey) return
 
     reconcileAttemptRef.current = attemptKey
@@ -194,7 +193,7 @@ export function useCheckoutSession(cartId: string) {
           if (action.action === 'remove') {
             try {
               const next = await serverApi.removeCartItem({
-                cartId,
+                cartToken,
                 cartItemId: action.itemId,
               })
               if (next.ok) setCheckoutCart(next.value)
@@ -204,7 +203,7 @@ export function useCheckoutSession(cartId: string) {
           } else if (action.action === 'update') {
             try {
               const next = await serverApi.setCartItemQuantity({
-                cartId,
+                cartToken,
                 cartItemId: action.itemId,
                 quantity: action.quantity,
               })
@@ -218,8 +217,8 @@ export function useCheckoutSession(cartId: string) {
           if (action.action !== 'add') continue
           try {
             const next = await serverApi.addCartItem({
-              cartId,
-              variantId: cartVariantIdFromProduct(action.variantId),
+              cartToken,
+              variantId: action.variantId,
               quantity: action.quantity,
             })
             setCheckoutCart(next)
@@ -237,7 +236,7 @@ export function useCheckoutSession(cartId: string) {
     })()
   }, [
     apiItems,
-    cartId,
+    cartToken,
     checkoutAlreadyPurchased,
     checkoutCart,
     loadCheckout,
@@ -257,7 +256,7 @@ export function useCheckoutSession(cartId: string) {
     setShippingLoading(true)
     setShippingError(null)
     void serverApi
-      .getShippingOptions({ cartId, postalCode })
+      .getShippingOptions({ cartToken, postalCode })
       .then((res) => {
         if (!cancelled) setShippingGroups(res.groups)
       })
@@ -275,7 +274,7 @@ export function useCheckoutSession(cartId: string) {
     return () => {
       cancelled = true
     }
-  }, [cartId, checkoutAlreadyPurchased, postalCode])
+  }, [cartToken, checkoutAlreadyPurchased, postalCode])
 
   const shippingFlat = useMemo(() => {
     const out: ShippingFlat[] = []
@@ -296,14 +295,14 @@ export function useCheckoutSession(cartId: string) {
     setSelectedShippingKey(shippingFlat[0]!.key)
   }, [shippingFlat, selectedShippingKey])
 
-  const externalRef = `checkout-${cartId}`
+  const externalRef = `checkout-${cartToken}`
 
   const initProviderCheckout = useCallback(
     (paymentMethodCode: string) => {
       const method = paymentMethods.find((m) => m.code === paymentMethodCode)
       if (!method || !methodUsesProviderCheckoutUi(method)) return
 
-      const dedupeKey = `${cartId}:${paymentMethodCode}`
+      const dedupeKey = `${cartToken}:${paymentMethodCode}`
       if (checkoutPaymentInitKeyRef.current === dedupeKey) return
       checkoutPaymentInitKeyRef.current = dedupeKey
 
@@ -311,7 +310,7 @@ export function useCheckoutSession(cartId: string) {
       setCheckoutPaymentError(null)
       setCheckoutPaymentMethodCode(paymentMethodCode)
       void serverApi
-        .checkoutCart({ cartId, paymentMethodCode, externalRef })
+        .checkoutCart({ cartToken, paymentMethodCode, externalRef })
         .then((result) => {
           setCheckoutPaymentResponse(result)
         })
@@ -323,7 +322,7 @@ export function useCheckoutSession(cartId: string) {
         })
         .finally(() => setCheckoutPaymentLoading(false))
     },
-    [cartId, externalRef, paymentMethods],
+    [cartToken, externalRef, paymentMethods],
   )
 
   const selectPaymentMethod = useCallback(
@@ -353,7 +352,7 @@ export function useCheckoutSession(cartId: string) {
 
   const saveBuyer = useCallback(async () => {
     const buyerCart = await serverApi.patchCartBuyer({
-      cartId,
+      cartToken,
       email: contact.email.trim(),
       firstName: contact.firstName.trim(),
       lastName: contact.lastName.trim(),
@@ -361,7 +360,7 @@ export function useCheckoutSession(cartId: string) {
     })
     setCheckoutCart(buyerCart)
     return buyerCart
-  }, [cartId, contact.email, contact.firstName, contact.lastName, contact.phone])
+  }, [cartToken, contact.email, contact.firstName, contact.lastName, contact.phone])
 
   const saveAddresses = useCallback(async () => {
     const countryCode = (contact.countryCode || 'PE').toUpperCase()
@@ -388,13 +387,13 @@ export function useCheckoutSession(cartId: string) {
     }
 
     const updated = await serverApi.patchCartAddresses({
-      cartId,
+      cartToken,
       shippingAddress: baseAddress,
       billingAddress: baseAddress,
     })
     setCheckoutCart(updated)
     return updated
-  }, [cartId, contact])
+  }, [cartToken, contact])
 
   const saveContactAndDelivery = useCallback(async () => {
     await saveBuyer()
@@ -404,7 +403,7 @@ export function useCheckoutSession(cartId: string) {
   const confirmShipping = useCallback(
     async (picked: ShippingFlat) => {
       const updated = await serverApi.putCartShippingMethod({
-        cartId,
+        cartToken,
         rateId: picked.rate.rateId,
         shippingMethodId: picked.rate.shippingMethodId,
         serviceCode: picked.rate.serviceCode ?? null,
@@ -418,7 +417,7 @@ export function useCheckoutSession(cartId: string) {
       setCheckoutCart(updated)
       return updated
     },
-    [cartId],
+    [cartToken],
   )
 
   /** Persiste buyer + dirección + envío al completar el paso Dirección. */
@@ -459,46 +458,46 @@ export function useCheckoutSession(cartId: string) {
     if (!code) return
     setCouponError(null)
     try {
-      const next = await serverApi.addCartPromotionCode({ cartId, code })
+      const next = await serverApi.addCartPromotionCode({ cartToken, code })
       setCheckoutCart(next)
       setCouponCode('')
     } catch (error) {
       setCouponError(error instanceof Error ? error.message : 'No se pudo aplicar el cupón.')
     }
-  }, [cartId, couponCode])
+  }, [cartToken, couponCode])
 
   const handleRemoveCoupon = useCallback(
     async (code: string) => {
       setCouponError(null)
       try {
-        const next = await serverApi.removeCartPromotionCode({ cartId, code })
+        const next = await serverApi.removeCartPromotionCode({ cartToken, code })
         setCheckoutCart(next)
       } catch (error) {
         setCouponError(error instanceof Error ? error.message : 'No se pudo remover el cupón.')
       }
     },
-    [cartId],
+    [cartToken],
   )
 
   const handleAddOrderBump = useCallback(
     async (orderBump: StorefrontOrderBump) => {
       const next = await serverApi.addCartItem({
-        cartId,
-        variantId: cartVariantIdFromProduct(orderBump.variantPublicId),
+        cartToken,
+        variantId: orderBump.variantId,
         quantity: 1,
       })
       setCheckoutCart(next)
       await loadCheckout()
       await reloadProviderCart()
     },
-    [cartId, loadCheckout, reloadProviderCart],
+    [cartToken, loadCheckout, reloadProviderCart],
   )
 
   const uploadPaymentReceipt = useCallback(
     async (file: File) => {
-      return serverApi.uploadPaymentReceipt({ cartId, file, fileName: file.name })
+      return serverApi.uploadPaymentReceipt({ cartToken, file, fileName: file.name })
     },
-    [cartId],
+    [cartToken],
   )
 
   const payNow = useCallback(
@@ -539,7 +538,7 @@ export function useCheckoutSession(cartId: string) {
         }
 
         const result = await serverApi.checkoutCart({
-          cartId,
+          cartToken,
           paymentMethodCode: code,
           externalRef,
           ...(options?.receiptUrl ? { receiptUrl: options.receiptUrl } : {}),
@@ -557,7 +556,7 @@ export function useCheckoutSession(cartId: string) {
       }
     },
     [
-      cartId,
+      cartToken,
       checkoutPaymentMethodCode,
       checkoutPaymentResponse,
       confirmShipping,
@@ -589,7 +588,7 @@ export function useCheckoutSession(cartId: string) {
     : subtotal
 
   return {
-    cartId,
+    cartToken,
     loadStatus,
     loadError,
     cartData: checkoutCart,

package/src/config.mjs

@@ -57,6 +57,7 @@ const configSchema = z.object({
   cloud: z
     .object({
       baseUrl: z.string().url().optional(),
+      artifactBaseUrl: z.string().url().optional(),
       storeSlug: z
         .string()
         .trim()

package/src/hooks/recently-viewed.ts

@@ -61,7 +61,7 @@ export function trackRecentlyViewed(
 }
 
 export type TrackableProduct = {
-  id: string | number
+  id: string
   name: string
   slug: string
   imageUrl?: string | null
@@ -72,7 +72,7 @@ export type TrackableProduct = {
 
 export function toRecentlyViewedItem(product: TrackableProduct): RecentlyViewedItem {
   return {
-    id: String(product.id),
+    id: product.id,
     name: product.name,
     slug: product.slug,
     imageUrl: product.imageUrl || product.images?.[0]?.url || '',

package/src/index.ts

@@ -31,6 +31,7 @@ export {
   DepartmentsSchema,
   DistrictSchema,
   DistrictsSchema,
+  CartTokenSchema,
   EntityIdSchema,
   NullableEntityIdSchema,
   OptionalEntityIdSchema,
@@ -46,7 +47,7 @@ export {
   StorefrontMenuItemSchema,
   getMenuItems,
 } from '@ecomiq/core'
-export type { EntityId } from '@ecomiq/core'
+export type { CartToken, EntityId } from '@ecomiq/core'
 export { getCountries, getDepartments, getDistricts, getProvinces } from '@ecomiq/core'
 export {
   AddCartItemParamsSchema,
@@ -75,7 +76,6 @@ export {
   CartAddressesParamsSchema,
   CartPromotionCodeParamsSchema,
   UpdateCartItemQuantityParamsSchema,
-  cartVariantIdFromProduct,
   sanitizeHtml,
   stripHtml,
 } from '@ecomiq/core'
@@ -147,9 +147,7 @@ export type {
   CustomerProfile,
   CustomerProfilePatch,
   CustomerOrderDetail,
-  CustomerOrderDetailDto,
   CustomerOrderListItem,
-  CustomerOrderListItemDto,
 } from '@ecomiq/core'
 export {
   CustomerAddressSchema,

package/src/pages/checkout.$checkoutId.tsx

@@ -56,5 +56,5 @@ function CheckoutPage({ params }: { params: { checkoutId: string } }) {
     )
   }
 
-  return <CheckoutSessionView cartId={checkoutId} />
+  return <CheckoutSessionView cartToken={checkoutId} />
 }

package/src/pages/pages.$pageSlug.tsx

@@ -1,9 +1,12 @@
 /**
- * Página CMS cerrada (`/pages/$pageSlug`).
- * Resuelve contenido publicado vía GET /v1/pages/{slug}.
+ * Página de contenido (`/pages/$pageSlug`).
+ * La Definition es la dueña de estas rutas; el CMS queda solo como fallback
+ * de lectura para tiendas que aún no migraron sus páginas.
  */
 import type { CmsPageDetailsDto } from '@ecomiq/core'
+import type { ActiveStorefrontPage } from '../storefront-runtime'
 import {
+  DefinitionSections,
   definePage,
   sanitizeHtml,
   serverApi,
@@ -21,30 +24,51 @@ const ContentPageSettingsSchema = z.object({
   }).optional(),
 }).passthrough()
 
-type ContentPageData = {
-  page: CmsPageDetailsDto
-  content: z.infer<typeof ContentPageSettingsSchema>
-}
+type ContentPageData =
+  | Extract<ActiveStorefrontPage, { kind: 'definition' }>
+  | {
+      kind: 'cms'
+      page: CmsPageDetailsDto
+      content: z.infer<typeof ContentPageSettingsSchema>
+    }
 
 export default definePage<ContentPageData, { pageSlug: string }>({
   loader: async ({ params }) => {
+    const resolved = await serverApi.getActiveStorefrontPage(
+      `/pages/${params.pageSlug}`,
+    )
+    if (resolved.kind === 'definition') return resolved
+
     const page = await serverApi.getPageBySlug(params.pageSlug)
     if (page.status !== 'published') throw new Error('Página no publicada')
 
     return {
+      kind: 'cms' as const,
       page,
       content: ContentPageSettingsSchema.parse(page.settings ?? {}),
     }
   },
 
-  meta: ({ data }) => ({
-    title: data.content.seo?.title ?? data.content.title ?? data.page.name,
-    description: data.content.seo?.description ?? (
-      data.content.html
-        ? stripHtml(data.content.html).slice(0, 155)
-        : undefined
-    ),
-  }),
+  meta: ({ data, settings }) => {
+    if (data.kind === 'definition') {
+      const { page } = data
+      return {
+        title: page.seo.title ?? page.title ?? settings?.store.name ?? '',
+        ...(page.seo.description === undefined
+          ? {}
+          : { description: page.seo.description }),
+        ...(page.seo.noindex ? { noIndex: true } : {}),
+      }
+    }
+    return {
+      title: data.content.seo?.title ?? data.content.title ?? data.page.name,
+      description: data.content.seo?.description ?? (
+        data.content.html
+          ? stripHtml(data.content.html).slice(0, 155)
+          : undefined
+      ),
+    }
+  },
 
   error: () => (
     <StorefrontError
@@ -53,22 +77,35 @@ export default definePage<ContentPageData, { pageSlug: string }>({
     />
   ),
 
-  component: ({ data }) => (
-    <article className="mx-auto w-full max-w-4xl px-4 py-10 sm:py-14">
-      <header className="mb-8 border-b pb-8">
-        <h1 className="text-balance text-3xl font-semibold tracking-[-0.02em] md:text-4xl">
-          {data.content.title ?? data.page.name}
-        </h1>
-      </header>
-
-      {data.content.html ? (
-        <div
-          className="prose prose-neutral max-w-none text-foreground prose-headings:font-semibold prose-a:text-primary"
-          dangerouslySetInnerHTML={{ __html: sanitizeHtml(data.content.html) }}
+  component: ({ data, settings }) => {
+    if (data.kind === 'definition') {
+      return (
+        <DefinitionSections
+          definition={data.definition}
+          pageId={data.page.id}
+          data={data.data}
+          locale={settings.store.language}
+          currency={settings.store.currency}
         />
-      ) : (
-        <p className="text-muted-foreground">Contenido no disponible.</p>
-      )}
-    </article>
-  ),
+      )
+    }
+    return (
+      <article className="mx-auto w-full max-w-4xl px-4 py-10 sm:py-14">
+        <header className="mb-8 border-b pb-8">
+          <h1 className="text-balance text-3xl font-semibold tracking-[-0.02em] md:text-4xl">
+            {data.content.title ?? data.page.name}
+          </h1>
+        </header>
+
+        {data.content.html ? (
+          <div
+            className="prose prose-neutral max-w-none text-foreground prose-headings:font-semibold prose-a:text-primary"
+            dangerouslySetInnerHTML={{ __html: sanitizeHtml(data.content.html) }}
+          />
+        ) : (
+          <p className="text-muted-foreground">Contenido no disponible.</p>
+        )}
+      </article>
+    )
+  },
 })

package/src/pages/thank-you.tsx

@@ -8,7 +8,7 @@ import { definePage, Link } from '../index'
 import { buttonVariants, cn } from '../ui'
 
 const ThankYouSearchSchema = z.object({
-  cartId: z.string().optional(),
+  cartToken: z.string().optional(),
   transactionId: z.string().optional(),
 })
 

package/src/providers/cart.tsx

@@ -17,14 +17,14 @@ import {
   useState,
   type ReactNode,
 } from 'react'
-import { type StorefrontCart, EntityIdSchema } from '@ecomiq/core'
+import { CartTokenSchema, type StorefrontCart } from '@ecomiq/core'
 import { z } from 'zod'
 import { serverApi } from '../server'
 
 const CartSessionSchema = z.object({
   version: z.literal(1),
   storeId: z.string().min(1),
-  cartId: EntityIdSchema,
+  cartToken: CartTokenSchema,
 })
 
 export type CartLoadStatus = 'loading' | 'ready' | 'error'
@@ -36,7 +36,7 @@ export type CartMutation = {
 
 export interface CartContextValue {
   cart: StorefrontCart | null
-  cartId: string | undefined
+  cartToken: string | undefined
   itemCount: number
   loadStatus: CartLoadStatus
   mutation: CartMutation | null
@@ -77,20 +77,20 @@ export function CartProvider({
 }) {
   const key = sessionKey(storeId)
   const [cart, setCart] = useState<StorefrontCart | null>(null)
-  const [cartId, setCartId] = useState<string>()
+  const [cartToken, setCartToken] = useState<string>()
   const [loadStatus, setLoadStatus] = useState<CartLoadStatus>('loading')
   const [mutation, setMutation] = useState<CartMutation | null>(null)
   const [error, setError] = useState<string>()
   const mutationInFlight = useRef(false)
 
-  const persist = (nextCartId: string) => {
-    setCartId(nextCartId)
-    localStorage.setItem(key, JSON.stringify({ version: 1, storeId, cartId: nextCartId }))
+  const persist = (nextCartToken: string) => {
+    setCartToken(nextCartToken)
+    localStorage.setItem(key, JSON.stringify({ version: 1, storeId, cartToken: nextCartToken }))
   }
 
   const clear = () => {
     setCart(null)
-    setCartId(undefined)
+    setCartToken(undefined)
     localStorage.removeItem(key)
   }
 
@@ -104,9 +104,9 @@ export function CartProvider({
       return
     }
 
-    setCartId(stored.cartId)
+    setCartToken(stored.cartToken)
     try {
-      const result = await serverApi.loadCart({ cartId: stored.cartId })
+      const result = await serverApi.loadCart({ cartToken: stored.cartToken })
       if (!result.ok) {
         setError(result.error.message)
         setLoadStatus('error')
@@ -147,7 +147,7 @@ export function CartProvider({
       let result
       try {
         result = await serverApi.addProductToCart({
-          cartId,
+          cartToken,
           currencyCode,
           variantId: input.variantId,
           quantity: input.quantity,
@@ -164,7 +164,7 @@ export function CartProvider({
       }
 
       setError(undefined)
-      persist(result.value.cartId)
+      persist(result.value.cartToken)
       setCart(result.value.cart)
       return result.value.cart
     } finally {
@@ -174,7 +174,7 @@ export function CartProvider({
   }
 
   const setItemQuantity = async (itemId: string, quantity: number) => {
-    if (!cartId) {
+    if (!cartToken) {
       setError('No hay un carrito activo.')
       return
     }
@@ -190,7 +190,7 @@ export function CartProvider({
       let result
       try {
         result = await serverApi.setCartItemQuantity({
-          cartId,
+          cartToken,
           cartItemId: itemId,
           quantity,
         })
@@ -213,7 +213,7 @@ export function CartProvider({
   }
 
   const removeItem = async (itemId: string) => {
-    if (!cartId) {
+    if (!cartToken) {
       setError('No hay un carrito activo.')
       return
     }
@@ -229,7 +229,7 @@ export function CartProvider({
       let result
       try {
         result = await serverApi.removeCartItem({
-          cartId,
+          cartToken,
           cartItemId: itemId,
         })
       } catch {
@@ -252,7 +252,7 @@ export function CartProvider({
 
   const value: CartContextValue = {
     cart,
-    cartId,
+    cartToken,
     itemCount: cart?.items.reduce((sum, item) => sum + item.quantity, 0) ?? 0,
     loadStatus,
     mutation,

package/src/server-config-store.ts

@@ -3,6 +3,7 @@ import { createServerOnlyFn } from '@tanstack/react-start'
 
 export interface ServerEcomiqCloudConfig {
   baseUrl?: string
+  artifactBaseUrl?: string
   storeSlug?: string
   timeoutMs?: number
   cacheTtlMs?: number