@moonbase.sh/vue 0.1.31 → 0.1.34

package/dist/index.cjs

@@ -22,7 +22,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   createStorefront: () => createStorefront,
-  findBestPrice: () => findBestPrice,
   storefrontKey: () => storefrontKey,
   useAuth: () => useAuth,
   useBundle: () => useBundle,
@@ -32,7 +31,7 @@ __export(src_exports, {
   useProducts: () => useProducts
 });
 module.exports = __toCommonJS(src_exports);
-var import_api_client3 = require("@moonbase.sh/api-client");
+var import_api_client2 = require("@moonbase.sh/api-client");
 
 // src/context.ts
 var import_api_client = require("@moonbase.sh/api-client");
@@ -66,6 +65,7 @@ var StorefrontContextImpl = class {
     const cachedOrderJson = localStorage.getItem("moonbase_session");
     if (cachedOrderJson) {
       this.currentOrder = (0, import_vue.ref)(JSON.parse(cachedOrderJson));
+      const _1 = this.refreshOrder();
     } else {
       this.currentOrder = (0, import_vue.ref)({
         id: (0, import_uuid.v4)(),
@@ -93,7 +93,7 @@ var StorefrontContextImpl = class {
   }
   install(app) {
     app.provide(storefrontKey, this);
-    console.log("Storefront installed");
+    console.log("Moonbase.sh storefront installed");
   }
   async updateUser() {
     try {
@@ -131,6 +131,33 @@ var StorefrontContextImpl = class {
         break;
     }
   }
+  async refreshOrder() {
+    try {
+      const latestOrder = await this.client.orders.get(this.currentOrder.value.id);
+      if (latestOrder) {
+        if (latestOrder.status !== import_api_client.OrderStatus.Open) {
+          this.resetOrder();
+        } else {
+          localStorage.setItem("moonbase_session", JSON.stringify(latestOrder));
+          this.currentOrder.value = latestOrder;
+        }
+      }
+    } catch (err) {
+      if (err != null)
+        this.resetOrder();
+    }
+  }
+  resetOrder() {
+    var _a;
+    this.currentOrder.value = {
+      id: (0, import_uuid.v4)(),
+      currency: ((_a = this.storefront.value) == null ? void 0 : _a.suggestedCurrency) || "",
+      status: import_api_client.OrderStatus.Open,
+      items: [],
+      couponsApplied: []
+    };
+    localStorage.setItem("moonbase_session", JSON.stringify(this.currentOrder.value));
+  }
 };
 
 // src/index.ts
@@ -173,17 +200,7 @@ function useProducts() {
 }
 
 // src/composables/useCart.ts
-var import_api_client2 = require("@moonbase.sh/api-client");
 var import_vue6 = require("vue");
-
-// src/utils/findBestPrice.ts
-function findBestPrice(variations, currency, model) {
-  const prices = variations.filter((v) => v.model === model && v.prices[currency] !== void 0).map((v) => v.prices[currency]);
-  prices.sort((a, b) => b - a);
-  return prices.length === 0 ? 0 : prices[0];
-}
-
-// src/composables/useCart.ts
 function useCart() {
   const storefront = (0, import_vue6.inject)(storefrontKey);
   if (!storefront)
@@ -194,37 +211,45 @@ function useCart() {
     total: (0, import_vue6.computed)(() => {
       const currency = storefront.currentOrder.value.currency || storefront.storefront.value.suggestedCurrency;
       const total = storefront.currentOrder.value.items.reduce((agg, item) => {
-        var _a, _b;
-        let bestPrice;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        let price;
         if (item.type === "Product") {
-          const variations = ((_a = useProduct(item.productId).value) == null ? void 0 : _a.pricing) || [];
-          bestPrice = findBestPrice(variations, currency, item.pricingModel);
+          const product = useProduct(item.productId);
+          const variations = ((_a = product.value) == null ? void 0 : _a.variations) || [];
+          const pickedVariation = variations.find((v) => v.id === item.variationId);
+          price = (_e = (_d = pickedVariation == null ? void 0 : pickedVariation.price[currency]) != null ? _d : (_c = (_b = product.value) == null ? void 0 : _b.defaultVariation) == null ? void 0 : _c.price[currency]) != null ? _e : 0;
         } else {
-          const variations = ((_b = useBundle(item.bundleId).value) == null ? void 0 : _b.pricing) || [];
-          bestPrice = findBestPrice(variations, currency, import_api_client2.PricingModel.Purchase);
+          const bundle = useBundle(item.bundleId);
+          const variations = ((_f = bundle.value) == null ? void 0 : _f.variations) || [];
+          const pickedVariation = variations.find((v) => v.id === item.variationId);
+          price = (_j = (_i = pickedVariation == null ? void 0 : pickedVariation.price[currency]) != null ? _i : (_h = (_g = bundle.value) == null ? void 0 : _g.defaultVariation) == null ? void 0 : _h.price[currency]) != null ? _j : 0;
         }
-        return agg + bestPrice * item.quantity;
+        return agg + price * item.quantity;
       }, 0);
       return { amount: total, currency };
     }),
-    addToCart: (item, model = import_api_client2.PricingModel.Purchase) => {
-      let lineItem = storefront.currentOrder.value.items.find((i) => i.type === "Product" && i.productId === item.id && i.pricingModel === model || i.type === "Bundle" && i.bundleId === item.id);
+    addToCart: (item, variation) => {
+      variation != null ? variation : variation = item.defaultVariation;
+      if (!variation)
+        throw new Error("Added item does not have a default variation, and none have been specified");
+      let lineItem = storefront.currentOrder.value.items.find((i) => i.type === "Product" && i.productId === item.id && i.variationId === variation.id || i.type === "Bundle" && i.bundleId === item.id && i.variationId === variation.id);
       if (!lineItem) {
         if (item.type === "bundle") {
           lineItem = {
             type: "Bundle",
             bundleId: item.id,
             bundle: item,
-            quantity: 1
+            quantity: 1,
+            variationId: variation.id
           };
           storefront.currentOrder.value.items.push(lineItem);
         } else if (item.type === "product") {
           lineItem = {
             type: "Product",
-            pricingModel: model,
             productId: item.id,
             product: item,
-            quantity: 1
+            quantity: 1,
+            variationId: variation.id
           };
           storefront.currentOrder.value.items.push(lineItem);
         }
@@ -267,6 +292,18 @@ function useAuth() {
       const _ = storefront.updateStorefront();
       return user;
     },
+    signUp: async (name, email, password, acceptedPrivacyPolicy, acceptedTermsAndConditions) => {
+      const user = await storefront.client.identity.signUp(
+        name,
+        email,
+        password,
+        acceptedPrivacyPolicy,
+        acceptedTermsAndConditions
+      );
+      storefront.currentUser.value = user;
+      const _ = storefront.updateStorefront();
+      return user;
+    },
     signOut: () => {
       storefront.client.tokenStore.setUser(null);
       storefront.currentUser.value = null;
@@ -296,12 +333,11 @@ function createStorefront(endpoint) {
   const configuration = {
     endpoint
   };
-  return new StorefrontContextImpl(configuration, new import_api_client3.MoonbaseClient(configuration));
+  return new StorefrontContextImpl(configuration, new import_api_client2.MoonbaseClient(configuration));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createStorefront,
-  findBestPrice,
   storefrontKey,
   useAuth,
   useBundle,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, PricingModel, PricingVariation, OpenLineItem } from '@moonbase.sh/api-client';
+import { Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, PricingVariation, OpenLineItem } from '@moonbase.sh/api-client';
 export * from '@moonbase.sh/api-client';
 import * as vue from 'vue';
 import { Ref, App, InjectionKey } from 'vue';
@@ -37,7 +37,7 @@ declare function useCart(): {
         amount: number;
         currency: string;
     }>;
-    addToCart: (item: StorefrontProduct | StorefrontBundle, model?: PricingModel) => void;
+    addToCart: (item: StorefrontProduct | StorefrontBundle, variation?: PricingVariation) => void;
     removeFromCart: (cartItem: CartItem) => void;
     checkout: (returnUrl: string) => Promise<void>;
 };
@@ -56,6 +56,12 @@ declare function useAuth(): {
         name: string;
         tenantId: string;
     }>;
+    signUp: (name: string, email: string, password: string, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean) => Promise<{
+        id: string;
+        email: string;
+        name: string;
+        tenantId: string;
+    }>;
     signOut: () => void;
     update: (name: string, email: string, emailConfirmationToken?: string) => Promise<{
         needsEmailConfirmationToken: boolean;
@@ -67,12 +73,10 @@ declare function useAuth(): {
 
 declare const storefrontKey: InjectionKey<StorefrontContext>;
 
-declare function findBestPrice(variations: PricingVariation[], currency: string, model: PricingModel): number;
-
 interface Cart {
     items: CartItem[];
 }
 type CartItem = OpenLineItem & {};
 declare function createStorefront(endpoint: string): StorefrontContext;
 
-export { Cart, CartItem, createStorefront, findBestPrice, storefrontKey, useAuth, useBundle, useBundles, useCart, useProduct, useProducts };
+export { Cart, CartItem, createStorefront, storefrontKey, useAuth, useBundle, useBundles, useCart, useProduct, useProducts };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, PricingModel, PricingVariation, OpenLineItem } from '@moonbase.sh/api-client';
+import { Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, PricingVariation, OpenLineItem } from '@moonbase.sh/api-client';
 export * from '@moonbase.sh/api-client';
 import * as vue from 'vue';
 import { Ref, App, InjectionKey } from 'vue';
@@ -37,7 +37,7 @@ declare function useCart(): {
         amount: number;
         currency: string;
     }>;
-    addToCart: (item: StorefrontProduct | StorefrontBundle, model?: PricingModel) => void;
+    addToCart: (item: StorefrontProduct | StorefrontBundle, variation?: PricingVariation) => void;
     removeFromCart: (cartItem: CartItem) => void;
     checkout: (returnUrl: string) => Promise<void>;
 };
@@ -56,6 +56,12 @@ declare function useAuth(): {
         name: string;
         tenantId: string;
     }>;
+    signUp: (name: string, email: string, password: string, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean) => Promise<{
+        id: string;
+        email: string;
+        name: string;
+        tenantId: string;
+    }>;
     signOut: () => void;
     update: (name: string, email: string, emailConfirmationToken?: string) => Promise<{
         needsEmailConfirmationToken: boolean;
@@ -67,12 +73,10 @@ declare function useAuth(): {
 
 declare const storefrontKey: InjectionKey<StorefrontContext>;
 
-declare function findBestPrice(variations: PricingVariation[], currency: string, model: PricingModel): number;
-
 interface Cart {
     items: CartItem[];
 }
 type CartItem = OpenLineItem & {};
 declare function createStorefront(endpoint: string): StorefrontContext;
 
-export { Cart, CartItem, createStorefront, findBestPrice, storefrontKey, useAuth, useBundle, useBundles, useCart, useProduct, useProducts };
+export { Cart, CartItem, createStorefront, storefrontKey, useAuth, useBundle, useBundles, useCart, useProduct, useProducts };

package/dist/index.js

@@ -33,6 +33,7 @@ var StorefrontContextImpl = class {
     const cachedOrderJson = localStorage.getItem("moonbase_session");
     if (cachedOrderJson) {
       this.currentOrder = ref(JSON.parse(cachedOrderJson));
+      const _1 = this.refreshOrder();
     } else {
       this.currentOrder = ref({
         id: uuidv4(),
@@ -60,7 +61,7 @@ var StorefrontContextImpl = class {
   }
   install(app) {
     app.provide(storefrontKey, this);
-    console.log("Storefront installed");
+    console.log("Moonbase.sh storefront installed");
   }
   async updateUser() {
     try {
@@ -98,6 +99,33 @@ var StorefrontContextImpl = class {
         break;
     }
   }
+  async refreshOrder() {
+    try {
+      const latestOrder = await this.client.orders.get(this.currentOrder.value.id);
+      if (latestOrder) {
+        if (latestOrder.status !== OrderStatus.Open) {
+          this.resetOrder();
+        } else {
+          localStorage.setItem("moonbase_session", JSON.stringify(latestOrder));
+          this.currentOrder.value = latestOrder;
+        }
+      }
+    } catch (err) {
+      if (err != null)
+        this.resetOrder();
+    }
+  }
+  resetOrder() {
+    var _a;
+    this.currentOrder.value = {
+      id: uuidv4(),
+      currency: ((_a = this.storefront.value) == null ? void 0 : _a.suggestedCurrency) || "",
+      status: OrderStatus.Open,
+      items: [],
+      couponsApplied: []
+    };
+    localStorage.setItem("moonbase_session", JSON.stringify(this.currentOrder.value));
+  }
 };
 
 // src/index.ts
@@ -140,17 +168,7 @@ function useProducts() {
 }
 
 // src/composables/useCart.ts
-import { PricingModel } from "@moonbase.sh/api-client";
 import { computed as computed5, inject as inject5 } from "vue";
-
-// src/utils/findBestPrice.ts
-function findBestPrice(variations, currency, model) {
-  const prices = variations.filter((v) => v.model === model && v.prices[currency] !== void 0).map((v) => v.prices[currency]);
-  prices.sort((a, b) => b - a);
-  return prices.length === 0 ? 0 : prices[0];
-}
-
-// src/composables/useCart.ts
 function useCart() {
   const storefront = inject5(storefrontKey);
   if (!storefront)
@@ -161,37 +179,45 @@ function useCart() {
     total: computed5(() => {
       const currency = storefront.currentOrder.value.currency || storefront.storefront.value.suggestedCurrency;
       const total = storefront.currentOrder.value.items.reduce((agg, item) => {
-        var _a, _b;
-        let bestPrice;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        let price;
         if (item.type === "Product") {
-          const variations = ((_a = useProduct(item.productId).value) == null ? void 0 : _a.pricing) || [];
-          bestPrice = findBestPrice(variations, currency, item.pricingModel);
+          const product = useProduct(item.productId);
+          const variations = ((_a = product.value) == null ? void 0 : _a.variations) || [];
+          const pickedVariation = variations.find((v) => v.id === item.variationId);
+          price = (_e = (_d = pickedVariation == null ? void 0 : pickedVariation.price[currency]) != null ? _d : (_c = (_b = product.value) == null ? void 0 : _b.defaultVariation) == null ? void 0 : _c.price[currency]) != null ? _e : 0;
         } else {
-          const variations = ((_b = useBundle(item.bundleId).value) == null ? void 0 : _b.pricing) || [];
-          bestPrice = findBestPrice(variations, currency, PricingModel.Purchase);
+          const bundle = useBundle(item.bundleId);
+          const variations = ((_f = bundle.value) == null ? void 0 : _f.variations) || [];
+          const pickedVariation = variations.find((v) => v.id === item.variationId);
+          price = (_j = (_i = pickedVariation == null ? void 0 : pickedVariation.price[currency]) != null ? _i : (_h = (_g = bundle.value) == null ? void 0 : _g.defaultVariation) == null ? void 0 : _h.price[currency]) != null ? _j : 0;
         }
-        return agg + bestPrice * item.quantity;
+        return agg + price * item.quantity;
       }, 0);
       return { amount: total, currency };
     }),
-    addToCart: (item, model = PricingModel.Purchase) => {
-      let lineItem = storefront.currentOrder.value.items.find((i) => i.type === "Product" && i.productId === item.id && i.pricingModel === model || i.type === "Bundle" && i.bundleId === item.id);
+    addToCart: (item, variation) => {
+      variation != null ? variation : variation = item.defaultVariation;
+      if (!variation)
+        throw new Error("Added item does not have a default variation, and none have been specified");
+      let lineItem = storefront.currentOrder.value.items.find((i) => i.type === "Product" && i.productId === item.id && i.variationId === variation.id || i.type === "Bundle" && i.bundleId === item.id && i.variationId === variation.id);
       if (!lineItem) {
         if (item.type === "bundle") {
           lineItem = {
             type: "Bundle",
             bundleId: item.id,
             bundle: item,
-            quantity: 1
+            quantity: 1,
+            variationId: variation.id
           };
           storefront.currentOrder.value.items.push(lineItem);
         } else if (item.type === "product") {
           lineItem = {
             type: "Product",
-            pricingModel: model,
             productId: item.id,
             product: item,
-            quantity: 1
+            quantity: 1,
+            variationId: variation.id
           };
           storefront.currentOrder.value.items.push(lineItem);
         }
@@ -234,6 +260,18 @@ function useAuth() {
       const _ = storefront.updateStorefront();
       return user;
     },
+    signUp: async (name, email, password, acceptedPrivacyPolicy, acceptedTermsAndConditions) => {
+      const user = await storefront.client.identity.signUp(
+        name,
+        email,
+        password,
+        acceptedPrivacyPolicy,
+        acceptedTermsAndConditions
+      );
+      storefront.currentUser.value = user;
+      const _ = storefront.updateStorefront();
+      return user;
+    },
     signOut: () => {
       storefront.client.tokenStore.setUser(null);
       storefront.currentUser.value = null;
@@ -267,7 +305,6 @@ function createStorefront(endpoint) {
 }
 export {
   createStorefront,
-  findBestPrice,
   storefrontKey,
   useAuth,
   useBundle,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.1.31",
+  "version": "0.1.34",
   "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",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@vue/devtools-api": "^6.5.0",
     "uuid": "^9.0.0",
-    "@moonbase.sh/api-client": "0.1.31"
+    "@moonbase.sh/api-client": "0.1.34"
   },
   "peerDependencies": {
     "vue": "^3.2.0"