@moonbase.sh/vue 0.4.25 → 0.4.27

package/dist/index.js

@@ -7,6 +7,7 @@ import {
   NotAuthenticatedError,
   NotAuthorizedError,
   NotFoundError,
+  OfferUtils,
   OrderStatus,
   schemas as schemas2,
   TokenStore
@@ -103,6 +104,65 @@ function mountCheckout(endpoint) {
   };
 }
 
+// src/utils/iframe-subscription.ts
+import { z as z2 } from "zod";
+var closeEventSchema2 = z2.object({
+  source: z2.literal("moonbase-subscription"),
+  event: z2.literal("close"),
+  completed: z2.boolean()
+});
+var updatedPaymentMethodSchema = z2.object({
+  source: z2.literal("moonbase-subscription"),
+  event: z2.literal("updated-payment-method")
+});
+var eventSchema2 = z2.discriminatedUnion("event", [closeEventSchema2, updatedPaymentMethodSchema]);
+function mountSubscription(endpoint) {
+  if (typeof window === "undefined") {
+    console.warn("Can not mount subscription server side");
+    return;
+  }
+  if (document.getElementById("moonbase-subscription"))
+    return;
+  const iframe = document.createElement("iframe");
+  iframe.id = "moonbase-subscription";
+  iframe.src = endpoint;
+  iframe.style.position = "fixed";
+  iframe.style.top = "0px";
+  iframe.style.left = "0px";
+  iframe.style.right = "0px";
+  iframe.style.border = "none";
+  iframe.style.colorScheme = "normal";
+  iframe.style.backgroundColor = "transparent";
+  iframe.style.zIndex = Number.MAX_SAFE_INTEGER.toString();
+  iframe.setAttribute("background", "transparent");
+  iframe.setAttribute("frameborder", "0");
+  iframe.setAttribute("allowtransparency", "true");
+  iframe.setAttribute("allow", "payment");
+  iframe.height = "100%";
+  iframe.width = "100%";
+  document.body.append(iframe);
+  document.documentElement.style.overflow = "hidden";
+  window.onmessage = function(e) {
+    var _a;
+    try {
+      const evnt = eventSchema2.parse(e.data);
+      if (evnt.event === "close") {
+        if (document.body.contains(iframe)) {
+          document.documentElement.style.removeProperty("overflow");
+          document.body.removeChild(iframe);
+        }
+        window.dispatchEvent(new CustomEvent("moonbase-subscription-closed", {
+          detail: evnt
+        }));
+      }
+    } catch (err) {
+      if (((_a = e.data) == null ? void 0 : _a.source) === "moonbase-subscription") {
+        console.error("Could not parse event:", e.data, err);
+      }
+    }
+  };
+}
+
 // src/context.ts
 var _StorefrontContextImpl = class _StorefrontContextImpl {
   constructor(configuration, client, stateFactory) {
@@ -124,8 +184,10 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       });
       this.storefront = stateFactory(_StorefrontContextImpl.storefrontKey, {
         suggestedCurrency: "",
+        enabledCurrencies: [],
         bundles: [],
-        products: []
+        products: [],
+        offers: []
       });
       this.loadedStorefront = stateFactory(`${_StorefrontContextImpl.storefrontKey}_loaded`, false);
       this.utm = stateFactory(_StorefrontContextImpl.utmKey, void 0);
@@ -177,8 +239,10 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     } else {
       this.storefront = stateFactory(_StorefrontContextImpl.storefrontKey, {
         suggestedCurrency: "",
+        enabledCurrencies: [],
         bundles: [],
-        products: []
+        products: [],
+        offers: []
       });
       this.loadedStorefront = stateFactory(`${_StorefrontContextImpl.storefrontKey}_loaded`, false);
     }
@@ -200,6 +264,15 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         mountCheckout(finalEndpoint.toString());
         window.history.replaceState(null, "", window.location.href.split("?")[0]);
       }
+      if (intent === "update_subscription" && urlParams2.get("mb_complete") && endpoint) {
+        const parameters = Object.fromEntries([...urlParams2.entries()].filter(([key]) => !key.startsWith("mb_")));
+        const finalEndpoint = new URL(decodeURIComponent(endpoint));
+        for (const prop of Object.keys(parameters)) {
+          finalEndpoint.searchParams.append(prop, parameters[prop]);
+        }
+        mountSubscription(finalEndpoint.toString());
+        window.history.replaceState(null, "", window.location.href.split("?")[0]);
+      }
     }
     window.addEventListener("moonbase-checkout-completed", (e) => {
       const order = e.detail.order;
@@ -266,7 +339,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         localStorage.setItem(_StorefrontContextImpl.storefrontKey, JSON.stringify(latestStorefront));
       this.storefront.value = latestStorefront;
       this.loadedStorefront.value = true;
-      if (!this.currentOrder.value.currency) {
+      if (!this.currentOrder.value.currency || !latestStorefront.enabledCurrencies.includes(this.currentOrder.value.currency)) {
         this.currentOrder.value.currency = latestStorefront.suggestedCurrency;
       }
       this.currentOrder.value.items = this.enrichLineItems(this.currentOrder.value.items);
@@ -317,6 +390,9 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
           latestOrder.items = this.enrichLineItems(latestOrder.items);
           if (typeof window !== "undefined")
             localStorage.setItem(_StorefrontContextImpl.sessionKey, JSON.stringify(latestOrder));
+          if (this.storefront.value && !this.storefront.value.enabledCurrencies.includes(latestOrder.currency)) {
+            latestOrder.currency = this.storefront.value.suggestedCurrency;
+          }
           this.currentOrder.value = latestOrder;
         }
       }
@@ -350,28 +426,35 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
   enrichLineItems(lineItems) {
     if (this.storefront) {
       return lineItems.map((item) => {
-        var _a, _b;
+        var _a, _b, _c;
+        const offer = (_a = this.storefront.value.offers) == null ? void 0 : _a.find((o) => o.id === item.offerId);
         if (item.type === "Product") {
           const product = this.storefront.value.products.find((p) => p.id === item.productId);
           const variations = (product == null ? void 0 : product.variations) || [];
-          const variation = variations.find((v) => v.id === item.variationId);
+          let variation = variations.find((v) => v.id === item.variationId);
+          if (offer && variation && OfferUtils.eligible(offer, this.currentOrder.value)) {
+            variation = OfferUtils.applyToVariation(offer, variation);
+          }
           return {
             ...item,
             product,
             variation,
             price: variation == null ? void 0 : variation.price,
-            appliedDiscount: (_a = variation == null ? void 0 : variation.discount) != null ? _a : item.appliedDiscount
+            appliedDiscount: (_b = variation == null ? void 0 : variation.discount) != null ? _b : item.appliedDiscount
           };
         } else {
           const bundle = this.storefront.value.bundles.find((b) => b.id === item.bundleId);
           const variations = (bundle == null ? void 0 : bundle.variations) || [];
-          const variation = variations.find((v) => v.id === item.variationId);
+          let variation = variations.find((v) => v.id === item.variationId);
+          if (offer && variation && OfferUtils.eligible(offer, this.currentOrder.value)) {
+            variation = OfferUtils.applyToVariation(offer, variation);
+          }
           return {
             ...item,
             bundle,
             variation,
             price: variation == null ? void 0 : variation.price,
-            appliedDiscount: (_b = variation == null ? void 0 : variation.discount) != null ? _b : item.appliedDiscount
+            appliedDiscount: (_c = variation == null ? void 0 : variation.discount) != null ? _c : item.appliedDiscount
           };
         }
       });
@@ -572,7 +655,7 @@ function useBundles(context) {
 }
 
 // src/composables/useCart.ts
-import { MoonbaseError } from "@moonbase.sh/storefront-api";
+import { DiscountUtils, MoonbaseError, OfferUtils as OfferUtils2 } from "@moonbase.sh/storefront-api";
 import { computed as computed4, inject as inject5, unref } from "vue";
 function useCart(context) {
   const storefront = context != null ? context : inject5(storefrontKey);
@@ -581,7 +664,7 @@ function useCart(context) {
   const total = computed4(() => {
     const currency = storefront.currentOrder.value.currency || storefront.storefront.value.suggestedCurrency;
     const total2 = storefront.currentOrder.value.items.reduce((agg, item) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       let price;
       if (item.type === "Product") {
         const product = storefront.storefront.value.products.find((p) => p.id === item.productId);
@@ -596,70 +679,113 @@ function useCart(context) {
         const pickedVariation = variations.find((v) => v.id === item.variationId);
         price = (_i = (_h = pickedVariation == null ? void 0 : pickedVariation.price[currency]) != null ? _h : (_g = bundle == null ? void 0 : bundle.defaultVariation) == null ? void 0 : _g.price[currency]) != null ? _i : 0;
       }
+      const offer = (_j = storefront.storefront.value.offers) == null ? void 0 : _j.find((o) => o.id === item.offerId);
+      if (offer && OfferUtils2.eligible(offer, storefront.currentOrder.value)) {
+        const offerDiscount = DiscountUtils.apply(offer.discount, { [currency]: price });
+        price -= offerDiscount[currency];
+      }
       return agg + price * item.quantity;
     }, 0);
     return { amount: total2, currency };
   });
-  return {
-    items: computed4(() => storefront.enrichLineItems(storefront.currentOrder.value.items)),
-    currency: computed4(() => storefront.currentOrder.value.currency || storefront.storefront.value.suggestedCurrency),
-    total,
-    addToCart: (item, variation) => {
-      var _a, _b;
-      item = unref(item);
-      variation != null ? variation : variation = item.defaultVariation;
-      if (!variation)
-        throw new Error("Added item does not have a default variation, and none have been specified");
-      const id = `${item.type === "bundle" ? "b" : "p"}/${item.id}/${variation.id}`;
-      let lineItem = storefront.currentOrder.value.items.find((i) => i.id === id);
-      if (!lineItem) {
-        if (item.type === "bundle") {
-          lineItem = {
-            id,
-            type: "Bundle",
-            bundleId: item.id,
-            bundle: item,
-            quantity: 1,
-            variation,
-            variationId: variation.id,
-            price: variation.price,
-            appliedDiscount: variation.discount,
-            isDefaultVariation: variation.id === ((_a = item.defaultVariation) == null ? void 0 : _a.id)
-          };
-          storefront.currentOrder.value.items.push(lineItem);
-        } else if (item.type === "product") {
-          lineItem = {
+  function addToCart(item, variation, offer, options) {
+    var _a, _b, _c;
+    item = unref(item);
+    variation != null ? variation : variation = item.defaultVariation;
+    if (!variation)
+      throw new Error("Added item does not have a default variation, and none have been specified");
+    const id = `${item.type === "Bundle" ? "b" : "p"}/${item.id}/${variation.id}`;
+    let lineItem = storefront == null ? void 0 : storefront.currentOrder.value.items.find((i) => i.id === id);
+    if (!lineItem) {
+      if (item.type === "Bundle") {
+        lineItem = {
+          id,
+          type: "Bundle",
+          bundleId: item.id,
+          bundle: item,
+          quantity: 1,
+          variation,
+          variationId: variation.id,
+          offerId: offer == null ? void 0 : offer.id,
+          price: variation.price,
+          appliedDiscount: variation.discount,
+          isDefaultVariation: variation.id === ((_a = item.defaultVariation) == null ? void 0 : _a.id)
+        };
+        if ((options == null ? void 0 : options.bundleBehaviour) === "replace") {
+          const lineItemsToReplace = storefront == null ? void 0 : storefront.currentOrder.value.items.filter((i) => i.type === "Product" && item.products.some((p) => p.included && p.id === i.productId));
+          for (const productLineItem of lineItemsToReplace != null ? lineItemsToReplace : []) {
+            const index = storefront == null ? void 0 : storefront.currentOrder.value.items.findIndex((i) => i.id === productLineItem.id);
+            if (index !== void 0)
+              storefront == null ? void 0 : storefront.currentOrder.value.items.splice(index, 1);
+          }
+          lineItem.replaced = lineItemsToReplace == null ? void 0 : lineItemsToReplace.filter((i) => i.type === "Product").map((i) => `${i.productId}/${i.variationId}`);
+        }
+        storefront == null ? void 0 : storefront.currentOrder.value.items.push(lineItem);
+      } else if (item.type === "Product") {
+        lineItem = {
+          id,
+          type: "Product",
+          productId: item.id,
+          product: item,
+          quantity: 1,
+          variation,
+          variationId: variation.id,
+          offerId: offer == null ? void 0 : offer.id,
+          price: variation.price,
+          appliedDiscount: variation.discount,
+          isDefaultVariation: variation.id === ((_b = item.defaultVariation) == null ? void 0 : _b.id)
+        };
+        storefront == null ? void 0 : storefront.currentOrder.value.items.push(lineItem);
+      } else {
+        throw new MoonbaseError("Invalid input", `Could not handle item of type '${item.type}'`);
+      }
+    } else {
+      lineItem.quantity += 1;
+      (_c = lineItem.offerId) != null ? _c : lineItem.offerId = offer == null ? void 0 : offer.id;
+      if (!lineItem.variation && variation)
+        lineItem.variation = variation;
+      if (!lineItem.price && variation)
+        lineItem.price = variation.price;
+      if (!lineItem.appliedDiscount && variation.discount)
+        lineItem.appliedDiscount = variation.discount;
+      if (lineItem.type === "Product" && item.type === "Product" && !lineItem.product)
+        lineItem.product = item;
+      if (lineItem.type === "Bundle" && item.type === "Bundle" && !lineItem.bundle)
+        lineItem.bundle = item;
+    }
+    const _ = storefront == null ? void 0 : storefront.pushOrderContent();
+    return lineItem;
+  }
+  function addReplacedBundleProducts(cartItem) {
+    var _a, _b;
+    if (cartItem.type === "Bundle" && cartItem.replaced && cartItem.replaced.length > 0) {
+      for (const { productId, variationId } of cartItem.replaced.map((composite) => ({ productId: composite.split("/")[0], variationId: composite.split("/")[1] }))) {
+        const product = storefront == null ? void 0 : storefront.storefront.value.products.find((p) => p.id === productId);
+        const variation = (_a = product == null ? void 0 : product.variations) == null ? void 0 : _a.find((v) => v.id === variationId);
+        if (product && variation && !(storefront == null ? void 0 : storefront.currentOrder.value.items.some((i) => i.type === "Product" && i.productId === productId))) {
+          const id = `p/${product.id}/${variationId}`;
+          storefront == null ? void 0 : storefront.currentOrder.value.items.push({
             id,
             type: "Product",
-            productId: item.id,
-            product: item,
+            productId: product.id,
+            product,
             quantity: 1,
             variation,
-            variationId: variation.id,
+            variationId,
+            // offerId: offer?.id, // TODO: Should we handle this?
             price: variation.price,
             appliedDiscount: variation.discount,
-            isDefaultVariation: variation.id === ((_b = item.defaultVariation) == null ? void 0 : _b.id)
-          };
-          storefront.currentOrder.value.items.push(lineItem);
-        } else {
-          throw new MoonbaseError("Invalid input", `Could not handle item of type '${item.type}'`);
+            isDefaultVariation: variation.id === ((_b = product.defaultVariation) == null ? void 0 : _b.id)
+          });
         }
-      } else {
-        lineItem.quantity += 1;
-        if (!lineItem.variation && variation)
-          lineItem.variation = variation;
-        if (!lineItem.price && variation)
-          lineItem.price = variation.price;
-        if (!lineItem.appliedDiscount && variation.discount)
-          lineItem.appliedDiscount = variation.discount;
-        if (lineItem.type === "Product" && item.type === "product" && !lineItem.product)
-          lineItem.product = item;
-        if (lineItem.type === "Bundle" && item.type === "bundle" && !lineItem.bundle)
-          lineItem.bundle = item;
       }
-      const _ = storefront.pushOrderContent();
-      return lineItem;
-    },
+    }
+  }
+  return {
+    items: computed4(() => storefront.enrichLineItems(storefront.currentOrder.value.items)),
+    currency: computed4(() => storefront.currentOrder.value.currency || storefront.storefront.value.suggestedCurrency),
+    total,
+    addToCart,
     setQuantity: (cartItem, quantity) => {
       const cartItemRef = storefront.currentOrder.value.items.find((i) => i.id === cartItem.id);
       if (!cartItemRef)
@@ -668,6 +794,7 @@ function useCart(context) {
       if (cartItemRef.quantity <= 0) {
         const index = storefront.currentOrder.value.items.findIndex((i) => i.id === cartItemRef.id);
         storefront.currentOrder.value.items.splice(index, 1);
+        addReplacedBundleProducts(cartItem);
       }
       const _ = storefront.pushOrderContent();
       return cartItem;
@@ -675,6 +802,7 @@ function useCart(context) {
     removeFromCart: (cartItem) => {
       const index = storefront.currentOrder.value.items.findIndex((i) => i.id === cartItem.id);
       storefront.currentOrder.value.items.splice(index, 1);
+      addReplacedBundleProducts(cartItem);
       const _ = storefront.pushOrderContent();
     },
     checkout: async (options) => {
@@ -722,8 +850,8 @@ async function useCheckout(items, options, context) {
     const variation = (_a = item.variation) != null ? _a : target.defaultVariation;
     if (!variation)
       throw new Error("Added item does not have a default variation, and none have been specified");
-    const id = `${target.type === "bundle" ? "b" : "p"}/${target.id}/${variation.id}`;
-    if (target.type === "bundle") {
+    const id = `${target.type === "Bundle" ? "b" : "p"}/${target.id}/${variation.id}`;
+    if (target.type === "Bundle") {
       checkoutSession.push({
         id,
         type: "Bundle",
@@ -735,7 +863,7 @@ async function useCheckout(items, options, context) {
         price: variation.price,
         appliedDiscount: variation.discount
       });
-    } else if (target.type === "product") {
+    } else if (target.type === "Product") {
       checkoutSession.push({
         id,
         type: "Product",
@@ -785,7 +913,7 @@ async function useCheckout(items, options, context) {
 }
 
 // src/composables/useInventory.ts
-import { inject as inject7 } from "vue";
+import { inject as inject7, toRaw } from "vue";
 function useInventory(context) {
   const storefront = context != null ? context : inject7(storefrontKey);
   if (!storefront)
@@ -846,32 +974,98 @@ function useInventory(context) {
           }, { once: true });
         });
       }
+    },
+    updateSubscriptionPaymentMethod: async (subscription, options) => {
+      var _a;
+      const fallbackPath = typeof window !== "undefined" ? window.location.pathname : "";
+      const absoluteReturnUrl = new URL((_a = options.returnUrl) != null ? _a : fallbackPath, document.baseURI).href;
+      const response = await storefront.client.inventory.subscriptions.getById(subscription.id, {
+        toUpdatePaymentMethod: true,
+        returnUrl: absoluteReturnUrl
+      });
+      window.dispatchEvent(new CustomEvent("moonbase-subscription-payment-method-update-initiated", {
+        detail: { subscription: toRaw(subscription) }
+      }));
+      if (response.embeddedUpdatePaymentUrl && typeof window !== "undefined") {
+        const embeddedUrl = response.embeddedUpdatePaymentUrl;
+        return new Promise((resolve) => {
+          mountSubscription(embeddedUrl.replace("acme-co.beta.moonbase.sh", "localhost:3002"));
+          window.addEventListener("moonbase-subscription-closed", (e) => {
+            const evnt = e;
+            resolve({ completed: evnt.detail.completed });
+          }, { once: true });
+        });
+      } else {
+        throw new Error("No update URL found");
+      }
     }
   };
 }
 
-// src/composables/useProduct.ts
+// src/composables/useOffer.ts
 import { computed as computed5, inject as inject8 } from "vue";
-function useProduct(productId, context) {
+function useOffer(offerId, context) {
   const storefront = context != null ? context : inject8(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
-  return computed5(() => storefront.storefront.value.products.find((p) => p.id === productId) || null);
+  return computed5(() => {
+    var _a;
+    return ((_a = storefront.storefront.value.offers) == null ? void 0 : _a.find((o) => o.id === offerId)) || null;
+  });
 }
 
-// src/composables/useProducts.ts
+// src/composables/useOffers.ts
+import { OfferUtils as OfferUtils3 } from "@moonbase.sh/storefront-api";
 import { computed as computed6, inject as inject9 } from "vue";
-function useProducts(context) {
+function useOffers(context) {
+  const storefront = context != null ? context : inject9(storefrontKey);
+  if (!storefront)
+    throw new Error("No storefront configured");
+  return computed6(() => {
+    var _a;
+    return (_a = storefront.storefront.value.offers) != null ? _a : [];
+  });
+}
+function useEligibleOffers(context) {
   const storefront = context != null ? context : inject9(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
-  return computed6(() => storefront.storefront.value.products);
+  return computed6(() => {
+    var _a;
+    return ((_a = storefront.storefront.value.offers) != null ? _a : []).filter((o) => OfferUtils3.eligible(o, storefront.currentOrder.value) && !offerTargetIsInCart(o, storefront.currentOrder.value));
+  });
+}
+function offerTargetIsInCart(offer, order) {
+  if (order.items.some(
+    (i) => i.type === "Product" && offer.target.type === "Product" && i.productId === offer.target.id || i.type === "Bundle" && offer.target.type === "Bundle" && i.bundleId === offer.target.id
+  )) {
+    return true;
+  }
+  return false;
+}
+
+// src/composables/useProduct.ts
+import { computed as computed7, inject as inject10 } from "vue";
+function useProduct(productId, context) {
+  const storefront = context != null ? context : inject10(storefrontKey);
+  if (!storefront)
+    throw new Error("No storefront configured");
+  return computed7(() => storefront.storefront.value.products.find((p) => p.id === productId) || null);
+}
+
+// src/composables/useProducts.ts
+import { computed as computed8, inject as inject11 } from "vue";
+function useProducts(context) {
+  const storefront = context != null ? context : inject11(storefrontKey);
+  if (!storefront)
+    throw new Error("No storefront configured");
+  return computed8(() => storefront.storefront.value.products);
 }
 
 // src/composables/useVendor.ts
-import { inject as inject10, ref as ref2 } from "vue";
+import { inject as inject12, ref as ref2 } from "vue";
 function useVendor(context) {
-  const storefront = context != null ? context : inject10(storefrontKey);
+  const storefront = context != null ? context : inject12(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   const vendor = ref2(null);
@@ -888,9 +1082,9 @@ function useVendor(context) {
 
 // src/composables/useVoucher.ts
 import { NotFoundError as NotFoundError2 } from "@moonbase.sh/storefront-api";
-import { inject as inject11 } from "vue";
+import { inject as inject13 } from "vue";
 function useVoucher(context) {
-  const storefront = context != null ? context : inject11(storefrontKey);
+  const storefront = context != null ? context : inject13(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -938,7 +1132,10 @@ export {
   useBundles,
   useCart,
   useCheckout,
+  useEligibleOffers,
   useInventory,
+  useOffer,
+  useOffers,
   useProduct,
   useProducts,
   useVendor,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.4.25",
+  "version": "0.4.27",
   "description": "Package to let you build vue.js storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",
@@ -19,14 +19,14 @@
     "@vue/devtools-api": "^6.6.3",
     "uuid": "^9.0.1",
     "zod": "^3.23.8",
-    "@moonbase.sh/storefront-api": "0.4.25"
+    "@moonbase.sh/storefront-api": "0.4.27"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.8",
     "rimraf": "^5.0.10",
-    "tsup": "^7.2.0",
-    "typescript": "~5.1.6",
-    "vue": "^3.5.3"
+    "tsup": "^8.5.0",
+    "typescript": "~5.8.3",
+    "vue": "^3.5.17"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",