@jay-framework/wix-cart 0.20.0 → 0.21.0

package/dist/index.d.ts

@@ -1,48 +1,17 @@
 import { WixClient } from '@wix/sdk';
-import { W as WixCartService } from './index.client-C7UwcsSn.js';
-export { A as AddToCartOptions, q as CartIndicatorState, n as CartLineItem, C as CartOperationResult, l as CartState, o as CartSummary, R as ReactiveCartIndicator, b as WIX_CART_CONTEXT, a as WIX_CART_SERVICE, c as WixCartContext, d as WixCartInitData, r as cartIndicator, s as cartPage, j as estimateCurrentCartTotalsOrNull, i as getCurrentCartOrNull, h as getEmptyCartState, u as init, e as mapCartSummary, g as mapCartToIndicator, f as mapCartToState, k as mapEstimateTotalsToState, m as mapLineItem, t as miniCart, p as provideWixCartContext } from './index.client-C7UwcsSn.js';
-import { currentCart } from '@wix/ecom';
-import { BuildDescriptors } from '@wix/sdk-types';
+import { W as WixCartService } from './index.client-Ca5v2viE.js';
+export { A as AddToCartOptions, q as CartIndicatorState, n as CartLineItem, C as CartOperationResult, l as CartState, o as CartSummary, R as ReactiveCartIndicator, b as WIX_CART_CONTEXT, a as WIX_CART_SERVICE, c as WixCartContext, d as WixCartInitData, r as cartIndicator, s as cartPage, j as estimateCurrentCartTotalsOrNull, i as getCurrentCartOrNull, h as getEmptyCartState, u as init, e as mapCartSummary, g as mapCartToIndicator, f as mapCartToState, k as mapEstimateTotalsToState, m as mapLineItem, t as miniCart, p as provideWixCartContext } from './index.client-Ca5v2viE.js';
 import '@jay-framework/runtime';
 import '@jay-framework/reactive';
-import '@wix/auto_sdk_ecom_current-cart';
 import '@jay-framework/fullstack-component';
 import '@jay-framework/component';
-import '@wix/redirects';
-
-/**
- * Wix Cart Client Factory
- *
- * Creates a singleton instance of the Wix Cart client.
- * Used by both server service and client context.
- */
-
-/**
- * Get a configured Wix eCommerce Current Cart client (singleton)
- *
- * The Current Cart API allows you to manage the visitor's shopping cart.
- *
- * @returns Current Cart client instance from @wix/ecom
- * @see https://dev.wix.com/docs/sdk/backend-modules/ecom/current-cart/introduction
- */
-declare function getCurrentCartClient(wixClient: WixClient): BuildDescriptors<typeof currentCart, {}>;
 
 /**
  * Server-side Wix Cart Service
  *
- * Provides access to Wix Cart APIs on the server using API Key authentication.
- * This file contains server-only code (registerService).
+ * Provides the WixClient for cart operations on the server.
  */
 
-interface WixCartServiceOptions {
-    urls?: {
-        thankYou?: string;
-    };
-}
-/**
- * Creates, registers, and returns a Wix Cart service instance.
- * Called during server initialization.
- */
-declare function provideWixCartService(wixClient: WixClient, options?: WixCartServiceOptions): WixCartService;
+declare function provideWixCartService(wixClient: WixClient): WixCartService;
 
-export { WixCartService, getCurrentCartClient, provideWixCartService };
+export { WixCartService, provideWixCartService };

package/dist/index.js

@@ -1,37 +1,76 @@
 import { registerService, getService } from "@jay-framework/stack-server-runtime";
-import { currentCart } from "@wix/ecom";
-import { redirects } from "@wix/redirects";
 import { createJayService, makeJayStackComponent, RenderPipeline, makeJayInit } from "@jay-framework/fullstack-component";
 import { createJayContext, useGlobalContext } from "@jay-framework/runtime";
 import { registerReactiveGlobalContext, createSignal, useReactive, createEvent } from "@jay-framework/component";
-import { WIX_CLIENT_CONTEXT, WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
+import { wixFetch, WIX_CLIENT_CONTEXT, WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
 import * as fs from "fs";
 import * as path from "path";
 import * as yaml from "js-yaml";
-let currentCartInstance;
-function getCurrentCartClient(wixClient) {
-  if (!currentCartInstance) {
-    currentCartInstance = wixClient.use(currentCart);
-  }
-  return currentCartInstance;
-}
-let redirectsInstance;
-function getRedirectsClient(wixClient) {
-  if (!redirectsInstance) {
-    redirectsInstance = wixClient.use(redirects);
-  }
-  return redirectsInstance;
-}
 const WIX_CART_SERVICE = createJayService("Wix Cart Service");
-function provideWixCartService(wixClient, options) {
-  const service = {
-    cart: getCurrentCartClient(wixClient),
-    redirects: getRedirectsClient(wixClient),
-    urls: { thankYou: options?.urls?.thankYou || "/thank-you" }
-  };
+function provideWixCartService(wixClient) {
+  const service = { wixClient };
   registerService(WIX_CART_SERVICE, service);
   return service;
 }
+async function getCurrentCart(client) {
+  return wixFetch(client, "/ecom/v1/carts/current", { method: "GET" });
+}
+async function addToCurrentCart(client, lineItems) {
+  return wixFetch(client, "/ecom/v1/carts/current/add-to-cart", {
+    method: "POST",
+    body: { lineItems }
+  });
+}
+async function removeLineItemsFromCurrentCart(client, lineItemIds) {
+  return wixFetch(client, "/ecom/v1/carts/current/remove-line-items", {
+    method: "POST",
+    body: { lineItemIds }
+  });
+}
+async function updateCurrentCartLineItemQuantity(client, lineItems) {
+  return wixFetch(client, "/ecom/v1/carts/current/update-line-items-quantity", {
+    method: "POST",
+    body: {
+      lineItems: lineItems.map((item) => ({
+        id: item._id,
+        quantity: item.quantity
+      }))
+    }
+  });
+}
+async function updateCurrentCart(client, cartInfo) {
+  return wixFetch(client, "/ecom/v1/carts/current", {
+    method: "PATCH",
+    body: { cartInfo }
+  });
+}
+async function removeCouponFromCurrentCart(client) {
+  return wixFetch(client, "/ecom/v1/carts/current/remove-coupon", {
+    method: "POST",
+    body: {}
+  });
+}
+async function estimateCurrentCartTotals(client) {
+  return wixFetch(client, "/ecom/v1/carts/current/estimate-totals", {
+    method: "POST",
+    body: {}
+  });
+}
+async function createCheckoutFromCurrentCart(client) {
+  return wixFetch(client, "/ecom/v1/carts/current/create-checkout", {
+    method: "POST",
+    body: {}
+  });
+}
+async function createRedirectSession(client, options) {
+  return wixFetch(client, "/redirects-api/v1/redirect-session", {
+    method: "POST",
+    body: options
+  });
+}
+function stripWixMediaResize(url) {
+  return url.replace(/\/v1\/(?:fit|fill|crop)\/[^/]+\/file\.\w+$/, "");
+}
 function parseWixMediaUrl(url) {
   if (!url) return null;
   const match = url.match(
@@ -68,7 +107,10 @@ function formatWixMediaUrl(_id, url, resize) {
     }
   }
   if ((url == null ? void 0 : url.startsWith("http://")) || (url == null ? void 0 : url.startsWith("https://"))) {
-    return url;
+    return stripWixMediaResize(url) + resizeFragment;
+  }
+  if (_id) {
+    return `https://static.wixstatic.com/media/${_id}${resizeFragment}`;
   }
   return "";
 }
@@ -80,16 +122,21 @@ function mapLineItem(item) {
   const variantParts = descriptionLines.filter((line) => line.name?.translated).map(
     (line) => `${line.name?.translated}: ${line.colorInfo?.translated || line.plainText?.translated || ""}`
   );
-  const slug = item.url?.split("/").pop() || "";
+  const rawUrl = item.url;
+  const urlString = typeof rawUrl === "string" ? rawUrl : rawUrl?.relativePath || rawUrl?.url || "";
+  const slug = urlString.split("/").pop() || "";
+  const rawImage = item.image;
+  const imageUrl = typeof rawImage === "string" ? rawImage : rawImage?.url || "";
+  const imageId = typeof rawImage === "string" ? "" : rawImage?.id || "";
   return {
-    lineItemId: item._id || "",
+    lineItemId: item._id || item.id || "",
     productId: catalogRef?.catalogItemId || "",
     productName: item.productName?.translated || item.productName?.original || "",
     productUrl: slug ? `/products/${slug}` : "",
     variantName: variantParts.join(" / "),
     sku: physicalProperties?.sku || "",
     image: {
-      url: formatWixMediaUrl("", item.image || ""),
+      url: formatWixMediaUrl(imageId, imageUrl),
       altText: item.productName?.translated || ""
     },
     quantity: item.quantity || 1,
@@ -167,7 +214,7 @@ function mapCartToState(cart) {
   const lineItems = (cart.lineItems || []).map(mapLineItem);
   const appliedCoupon = cart.appliedDiscounts?.find((d) => d.coupon?.code)?.coupon?.code || "";
   return {
-    cartId: cart._id || "",
+    cartId: cart._id || cart.id || "",
     isEmpty: lineItems.length === 0,
     lineItems,
     summary: mapCartSummary(cart),
@@ -207,10 +254,10 @@ function isCartNotFoundError(error) {
   if (message.includes("not found") && message.includes("cart")) return true;
   return false;
 }
-async function getCurrentCartOrNull(cartClient) {
+async function getCurrentCartOrNull(wixClient) {
   try {
-    const response = await cartClient.getCurrentCart();
-    return response ?? null;
+    const response = await getCurrentCart(wixClient);
+    return response.cart ?? null;
   } catch (error) {
     if (isCartNotFoundError(error)) {
       return null;
@@ -218,9 +265,9 @@ async function getCurrentCartOrNull(cartClient) {
     throw error;
   }
 }
-async function estimateCurrentCartTotalsOrNull(cartClient) {
+async function estimateCurrentCartTotalsOrNull(wixClient) {
   try {
-    const response = await cartClient.estimateCurrentCartTotals({});
+    const response = await estimateCurrentCartTotals(wixClient);
     return response ?? null;
   } catch (error) {
     if (isCartNotFoundError(error)) {
@@ -242,7 +289,7 @@ function mapEstimateTotalsToState(estimate) {
   const discountAmount = parseFloat(priceSummary?.discount?.amount || "0");
   const hasTax = parseFloat(taxSummary?.totalTax?.amount || "0") > 0;
   return {
-    cartId: cart._id || "",
+    cartId: cart._id || cart.id || "",
     isEmpty: lineItems.length === 0,
     lineItems,
     summary: {
@@ -276,8 +323,6 @@ const WIX_CART_CONTEXT = createJayContext("wix:cart");
 function provideWixCartContext(thankYouUrl = "/thank-you") {
   const wixClientContext = useGlobalContext(WIX_CLIENT_CONTEXT);
   const wixClient = wixClientContext.client;
-  const cartClient = getCurrentCartClient(wixClient);
-  const redirectsClient = getRedirectsClient(wixClient);
   const cartContext = registerReactiveGlobalContext(WIX_CART_CONTEXT, () => {
     const [itemCount, setItemCount] = createSignal(0);
     const [hasItems, setHasItems] = createSignal(false);
@@ -291,77 +336,74 @@ function provideWixCartContext(thankYouUrl = "/thank-you") {
       });
     }
     async function refreshCartIndicator() {
-      const cart = await getCurrentCartOrNull(cartClient);
+      const cart = await getCurrentCartOrNull(wixClient);
       updateIndicatorFromCart(cart);
     }
     async function getEstimatedCart() {
-      const estimate = await estimateCurrentCartTotalsOrNull(cartClient);
+      const estimate = await estimateCurrentCartTotalsOrNull(wixClient);
       return mapEstimateTotalsToState(estimate);
     }
     async function addToCart(productId, quantity = 1, options) {
       console.log(`[WixCart] Adding to cart: ${productId} x ${quantity}`, options);
+      const catalogOptions = {};
+      if (options?.variantId) catalogOptions.variantId = options.variantId;
+      if (options?.modifiers) catalogOptions.options = options.modifiers;
+      if (options?.customTextFields)
+        catalogOptions.customTextFields = options.customTextFields;
       const lineItem = {
         catalogReference: {
           catalogItemId: productId,
           appId: WIX_STORES_APP_ID,
-          options: {
-            variantId: options?.variantId,
-            options: options?.modifiers,
-            customTextFields: options?.customTextFields
-          }
+          ...Object.keys(catalogOptions).length > 0 ? { options: catalogOptions } : {}
         },
         quantity
       };
-      const result = await cartClient.addToCurrentCart({
-        lineItems: [lineItem]
-      });
+      const result = await addToCurrentCart(wixClient, [lineItem]);
       updateIndicatorFromCart(result.cart ?? null);
       onItemAddedToCart.emit();
       return { cartState: mapCartToState(result.cart ?? null) };
     }
     async function removeLineItems(lineItemIds) {
-      const result = await cartClient.removeLineItemsFromCurrentCart(lineItemIds);
+      const result = await removeLineItemsFromCurrentCart(wixClient, lineItemIds);
       updateIndicatorFromCart(result.cart ?? null);
       return { cartState: mapCartToState(result.cart ?? null) };
     }
     async function updateLineItemQuantity(lineItemId, quantity) {
       let result;
       if (quantity === 0) {
-        result = await cartClient.removeLineItemsFromCurrentCart([lineItemId]);
+        result = await removeLineItemsFromCurrentCart(wixClient, [lineItemId]);
       } else {
-        result = await cartClient.updateCurrentCartLineItemQuantity([
-          { _id: lineItemId, quantity }
-        ]);
+        result = await updateCurrentCartLineItemQuantity(wixClient, [{ _id: lineItemId, quantity }]);
       }
       updateIndicatorFromCart(result.cart ?? null);
       return { cartState: mapCartToState(result.cart ?? null) };
     }
     async function clearCart() {
-      const cart = await getCurrentCartOrNull(cartClient);
+      const cart = await getCurrentCartOrNull(wixClient);
       if (cart?.lineItems?.length) {
         const lineItemIds = cart.lineItems.map((item) => item._id || "").filter(Boolean);
         if (lineItemIds.length > 0) {
-          await cartClient.removeLineItemsFromCurrentCart(lineItemIds);
+          await removeLineItemsFromCurrentCart(wixClient, lineItemIds);
         }
       }
       setItemCount(0);
       setHasItems(false);
     }
     async function applyCoupon(couponCode) {
-      const result = await cartClient.updateCurrentCart({ couponCode });
+      const result = await updateCurrentCart(wixClient, { couponCode });
       updateIndicatorFromCart(result ?? null);
       return { cartState: mapCartToState(result ?? null) };
     }
     async function removeCoupon() {
-      const result = await cartClient.removeCouponFromCurrentCart();
+      const result = await removeCouponFromCurrentCart(wixClient);
       updateIndicatorFromCart(result.cart ?? null);
       return { cartState: mapCartToState(result.cart ?? null) };
     }
     async function checkout() {
-      const { checkoutId } = await cartClient.createCheckoutFromCurrentCart({});
+      const { checkoutId } = await createCheckoutFromCurrentCart(wixClient);
       if (!checkoutId) throw new Error("Failed to create checkout from cart");
       const postFlowUrl = window.location.origin + thankYouUrl;
-      const { redirectSession } = await redirectsClient.createRedirectSession({
+      const { redirectSession } = await createRedirectSession(wixClient, {
         ecomCheckout: { checkoutId },
         callbacks: { postFlowUrl }
       });
@@ -478,7 +520,7 @@ const init = makeJayInit().withServer(async () => {
   console.log("[wix-cart] Initializing Wix Cart service...");
   const wixClient = getService(WIX_CLIENT_SERVICE);
   const config = loadWixCartConfig();
-  provideWixCartService(wixClient, { urls: config.urls });
+  provideWixCartService(wixClient);
   console.log("[wix-cart] Server initialization complete");
   return {
     enableClientCart: true,
@@ -491,7 +533,6 @@ export {
   cartIndicator,
   cartPage,
   estimateCurrentCartTotalsOrNull,
-  getCurrentCartClient,
   getCurrentCartOrNull,
   getEmptyCartState,
   init,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/wix-cart",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "type": "module",
   "description": "Wix Cart/Ecom shared package for Jay Framework",
   "license": "Apache-2.0",
@@ -37,27 +37,24 @@
     "test": ":"
   },
   "dependencies": {
-    "@jay-framework/component": "^0.20.0",
-    "@jay-framework/fullstack-component": "^0.20.0",
-    "@jay-framework/reactive": "^0.20.0",
-    "@jay-framework/runtime": "^0.20.0",
-    "@jay-framework/secure": "^0.20.0",
-    "@jay-framework/stack-client-runtime": "^0.20.0",
-    "@jay-framework/stack-server-runtime": "^0.20.0",
-    "@jay-framework/wix-server-client": "^0.20.0",
-    "@jay-framework/wix-utils": "^0.20.0",
-    "@wix/ecom": "^1.0.1996",
-    "@wix/redirects": "^1.0.77",
-    "@wix/sdk": "^1.21.5",
-    "@wix/sdk-runtime": "^1.0.11"
+    "@jay-framework/component": "^0.21.0",
+    "@jay-framework/fullstack-component": "^0.21.0",
+    "@jay-framework/reactive": "^0.21.0",
+    "@jay-framework/runtime": "^0.21.0",
+    "@jay-framework/secure": "^0.21.0",
+    "@jay-framework/stack-client-runtime": "^0.21.0",
+    "@jay-framework/stack-server-runtime": "^0.21.0",
+    "@jay-framework/wix-server-client": "^0.21.0",
+    "@jay-framework/wix-utils": "^0.21.0",
+    "@wix/sdk": "^1.21.5"
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",
     "@babel/preset-env": "^7.23.8",
     "@babel/preset-typescript": "^7.23.3",
-    "@jay-framework/compiler-jay-stack": "^0.20.0",
-    "@jay-framework/jay-cli": "^0.20.0",
-    "@jay-framework/vite-plugin": "^0.20.0",
+    "@jay-framework/compiler-jay-stack": "^0.21.0",
+    "@jay-framework/jay-cli": "^0.21.0",
+    "@jay-framework/vite-plugin": "^0.21.0",
     "@jay-framework/wix-dev-environment": "^0.6.12",
     "nodemon": "^3.0.3",
     "rimraf": "^5.0.5",