@ecomiq/storefront 2.0.22 → 2.1.4

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

@@ -1,6 +1,6 @@
 /**
- * Página CMS cerrada (`/pages/$pageSlug`).
- * Resuelve contenido publicado vía GET /v1/pages/{slug}.
+ * Página de contenido CMS (`/pages/$pageSlug`).
+ * Las páginas Definition las sirve el template (`$.tsx`).
  */
 import type { CmsPageDetailsDto } from '@ecomiq/core'
 import {

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

package/src/server.ts

@@ -58,8 +58,8 @@ import {
   type RemoveCartItemParams,
   type UpdateCartItemQuantityParams,
   type UploadPaymentReceiptParams,
+  CartTokenSchema,
   EntityIdSchema,
-  OptionalEntityIdSchema,
 } from '@ecomiq/core'
 import { z } from 'zod'
 import { getStorefrontClient } from './client'
@@ -71,16 +71,11 @@ import {
   type AddProductToCartInput,
 } from './cart-session'
 import { submitProductReview } from './review-submission'
-import { loadActiveStorefrontHome } from './storefront-runtime'
 
 const getSettingsFn = createServerFn({ method: 'GET' }).handler(() =>
   getStorefrontClient().getSettings(),
 )
 
-const getActiveStorefrontHomeFn = createServerFn({ method: 'GET' }).handler(
-  () => loadActiveStorefrontHome(),
-)
-
 const getStoreIdFn = createServerFn({ method: 'GET' }).handler(() =>
   getStorefrontClient().getStoreId(),
 )
@@ -140,9 +135,9 @@ const removeCartItemFn = createServerFn({ method: 'POST' })
   .handler(({ data }) => submitCartItemRemoval(getStorefrontClient(), data))
 
 const AddProductToCartServerSchema = z.object({
-  cartId: OptionalEntityIdSchema,
+  cartToken: CartTokenSchema.optional(),
   currencyCode: z.string().length(3),
-  variantId: z.string().regex(/^[1-9]\d*$/),
+  variantId: EntityIdSchema,
   quantity: z.number().int().positive(),
 })
 
@@ -179,7 +174,7 @@ const checkoutCartFn = createServerFn({ method: 'POST' })
   .handler(({ data }) => getStorefrontClient().checkoutCart(data))
 
 const CartPaymentReceiptServerSchema = z.object({
-  cartId: EntityIdSchema,
+  cartToken: CartTokenSchema,
   fileBase64: z.string().min(1),
   fileName: z.string().min(1),
   mimeType: z.string().min(1).optional(),
@@ -191,7 +186,7 @@ const uploadPaymentReceiptFn = createServerFn({ method: 'POST' })
     const binary = Uint8Array.from(atob(data.fileBase64), (c) => c.charCodeAt(0))
     const file = new Blob([binary], { type: data.mimeType ?? 'application/octet-stream' })
     return getStorefrontClient().uploadPaymentReceipt({
-      cartId: data.cartId,
+      cartToken: data.cartToken,
       file,
       fileName: data.fileName,
     })
@@ -227,7 +222,6 @@ const getDistrictsFn = createServerFn({ method: 'GET' })
  */
 export const serverApi = {
   getSettings: () => getSettingsFn(),
-  getActiveStorefrontHome: () => getActiveStorefrontHomeFn(),
   getStoreId: () => getStoreIdFn(),
   getCollections: () => getCollectionsFn(),
   getCollectionBySlug: (slug: string) => getCollectionBySlugFn({ data: { slug } }),
@@ -271,7 +265,7 @@ export const serverApi = {
     for (const byte of bytes) binary += String.fromCharCode(byte)
     return uploadPaymentReceiptFn({
       data: {
-        cartId: params.cartId,
+        cartToken: params.cartToken,
         fileBase64: btoa(binary),
         fileName:
           params.fileName ??

package/src/styles.css

@@ -5,7 +5,6 @@
 /* Escanear los componentes UI del propio framework */
 @source './ui';
 @source './components';
-@source './storefront-definition';
 @source './runtime';
 @source './pages';
 @source '../templates';
@@ -75,15 +74,3 @@
     transition-duration: 0.01ms !important;
   }
 }
-
-.storefront-definition {
-  font-family: var(--storefront-font-body);
-}
-
-.storefront-definition :where(h1, h2, h3, h4, h5, h6) {
-  font-family: var(--storefront-font-heading);
-}
-
-.storefront-definition-section {
-  padding-block: var(--storefront-section-padding);
-}

package/src/cloud-runtime-client.ts

@@ -1,218 +0,0 @@
-import { z } from 'zod'
-import { StorefrontDefinitionSchema } from '@ecomiq/storefront-definition'
-
-export const CloudRuntimeStoreSlugSchema = z
-  .string()
-  .trim()
-  .min(2)
-  .max(100)
-  .regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/)
-
-export const ActiveStorefrontRuntimeSchema = z
-  .object({
-    schemaVersion: z.literal(1),
-    store: z
-      .object({
-        slug: CloudRuntimeStoreSlugSchema,
-      })
-      .strict(),
-    environment: z
-      .object({
-        name: z.literal('production'),
-        status: z.literal('ready'),
-      })
-      .strict(),
-    publication: z
-      .object({
-        sequence: z.number().int().nonnegative(),
-        releaseSequence: z.number().int().nonnegative(),
-        publishedAt: z.string().datetime({ offset: true }),
-      })
-      .strict(),
-    definition: StorefrontDefinitionSchema,
-  })
-  .strict()
-
-export type ActiveStorefrontRuntime = z.infer<
-  typeof ActiveStorefrontRuntimeSchema
->
-
-export type CloudRuntimeFetch = (
-  input: RequestInfo | URL,
-  init?: RequestInit,
-) => Promise<Response>
-
-export interface CloudRuntimeClientOptions {
-  baseUrl: string
-  timeoutMs?: number
-  cacheTtlMs?: number
-  fetch?: CloudRuntimeFetch
-  now?: () => number
-}
-
-interface RuntimeCacheEntry {
-  value: ActiveStorefrontRuntime | null
-  etag?: string
-  expiresAt: number
-}
-
-export class CloudRuntimeResponseError extends Error {
-  readonly status: number
-
-  constructor(status: number) {
-    super(`Cloud runtime respondió HTTP ${status}`)
-    this.name = 'CloudRuntimeResponseError'
-    this.status = status
-  }
-}
-
-const DEFAULT_TIMEOUT_MS = 3_000
-const DEFAULT_CACHE_TTL_MS = 15_000
-const MAX_CACHE_ENTRIES = 100
-
-export class CloudRuntimeClient {
-  readonly baseUrl: string
-  readonly timeoutMs: number
-  readonly cacheTtlMs: number
-
-  private readonly fetchRuntime: CloudRuntimeFetch
-  private readonly now: () => number
-  private readonly cache = new Map<string, RuntimeCacheEntry>()
-  private readonly inFlight = new Map<
-    string,
-    Promise<ActiveStorefrontRuntime | null>
-  >()
-
-  constructor(options: CloudRuntimeClientOptions) {
-    this.baseUrl = new URL(options.baseUrl).toString().replace(/\/$/, '')
-    this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS
-    this.cacheTtlMs = options.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS
-    this.fetchRuntime = options.fetch ?? globalThis.fetch
-    this.now = options.now ?? Date.now
-  }
-
-  async resolveActiveStorefront(
-    storeSlugInput: string,
-  ): Promise<ActiveStorefrontRuntime | null> {
-    const storeSlug = CloudRuntimeStoreSlugSchema.parse(storeSlugInput)
-    const cached = this.cache.get(storeSlug)
-    if (cached && cached.expiresAt > this.now()) {
-      return cached.value
-    }
-
-    const activeRequest = this.inFlight.get(storeSlug)
-    if (activeRequest) return activeRequest
-
-    const request = this.requestActiveStorefront(storeSlug, cached).finally(
-      () => {
-        this.inFlight.delete(storeSlug)
-      },
-    )
-    this.inFlight.set(storeSlug, request)
-    return request
-  }
-
-  clearCache(): void {
-    this.cache.clear()
-    this.inFlight.clear()
-  }
-
-  private setCache(storeSlug: string, entry: RuntimeCacheEntry): void {
-    if (!this.cache.has(storeSlug) && this.cache.size >= MAX_CACHE_ENTRIES) {
-      const oldestKey = this.cache.keys().next().value
-      if (oldestKey !== undefined) this.cache.delete(oldestKey)
-    }
-    this.cache.set(storeSlug, entry)
-  }
-
-  private async requestActiveStorefront(
-    storeSlug: string,
-    cached?: RuntimeCacheEntry,
-  ): Promise<ActiveStorefrontRuntime | null> {
-    const controller = new AbortController()
-    const timeout = setTimeout(() => controller.abort(), this.timeoutMs)
-    const headers = new Headers({ accept: 'application/json' })
-    if (cached?.etag) headers.set('if-none-match', cached.etag)
-
-    try {
-      const response = await this.fetchRuntime(
-        new URL(
-          `/v1/runtime/storefronts/${encodeURIComponent(storeSlug)}`,
-          this.baseUrl,
-        ),
-        {
-          method: 'GET',
-          headers,
-          signal: controller.signal,
-        },
-      )
-
-      if (response.status === 304) {
-        if (!cached) throw new CloudRuntimeResponseError(304)
-        this.setCache(storeSlug, {
-          ...cached,
-          expiresAt: this.now() + this.cacheTtlMs,
-        })
-        return cached.value
-      }
-
-      if (response.status === 404) {
-        this.setCache(storeSlug, {
-          value: null,
-          etag: response.headers.get('etag') ?? undefined,
-          expiresAt: this.now() + this.cacheTtlMs,
-        })
-        return null
-      }
-
-      if (!response.ok) {
-        throw new CloudRuntimeResponseError(response.status)
-      }
-
-      const runtime = ActiveStorefrontRuntimeSchema.parse(
-        await response.json(),
-      )
-      if (runtime.store.slug !== storeSlug) {
-        throw new Error(
-          `Cloud runtime devolvió el store slug ${runtime.store.slug} para ${storeSlug}`,
-        )
-      }
-
-      this.setCache(storeSlug, {
-        value: runtime,
-        etag: response.headers.get('etag') ?? undefined,
-        expiresAt: this.now() + this.cacheTtlMs,
-      })
-      return runtime
-    } finally {
-      clearTimeout(timeout)
-    }
-  }
-}
-
-const sharedClients = new Map<string, CloudRuntimeClient>()
-
-export function getCloudRuntimeClient(
-  options: Omit<CloudRuntimeClientOptions, 'fetch' | 'now'>,
-): CloudRuntimeClient {
-  const key = [
-    new URL(options.baseUrl).toString(),
-    options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-    options.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS,
-  ].join('|')
-  const current = sharedClients.get(key)
-  if (current) return current
-
-  const client = new CloudRuntimeClient(options)
-  if (sharedClients.size >= 8) {
-    const oldestKey = sharedClients.keys().next().value
-    if (oldestKey !== undefined) sharedClients.delete(oldestKey)
-  }
-  sharedClients.set(key, client)
-  return client
-}
-
-export function resetCloudRuntimeClients(): void {
-  for (const client of sharedClients.values()) client.clearCache()
-  sharedClients.clear()
-}

package/src/storefront-definition/contract.ts

@@ -1 +0,0 @@
-export * from '@ecomiq/storefront-definition'

package/src/storefront-definition/index.ts

@@ -1,2 +0,0 @@
-export * from './contract'
-export * from './renderer'