npm - @moonbase.sh/vue - Versions diffs - 0.1.123 → 0.2.1 - Mend

@moonbase.sh/vue 0.1.123 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -97,9 +97,11 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
     const cachedOrderJson = localStorage.getItem(_StorefrontContextImpl.sessionKey);
     if (cachedOrderJson) {
+      console.log("Found cached session:", cachedOrderJson);
       this.currentOrder = (0, import_vue.ref)(JSON.parse(cachedOrderJson));
       const _1 = this.refreshOrder();
     } else {
+      console.log("No cached session found");
       this.currentOrder = (0, import_vue.ref)({
         id: (0, import_uuid.v4)(),
         status: import_storefront_api.OrderStatus.Open,
@@ -107,7 +109,6 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         items: [],
         couponsApplied: []
       });
-      localStorage.setItem(_StorefrontContextImpl.sessionKey, JSON.stringify(this.currentOrder.value));
     }
     const cachedStorefrontJson = localStorage.getItem(_StorefrontContextImpl.storefrontKey);
     if (cachedStorefrontJson) {
@@ -124,12 +125,20 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     const _2 = this.updateStorefront();
     const _3 = this.updateUser();
   }
+  get loadedStorefrontPromise() {
+    return new Promise((resolve) => {
+      (0, import_vue.watch)(this.loadedStorefront, (isLoaded) => {
+        if (isLoaded)
+          resolve();
+      }, { immediate: true });
+    });
+  }
   get loadedUserPromise() {
     return new Promise((resolve) => {
       (0, import_vue.watch)(this.loadedUser, (isLoaded) => {
         if (isLoaded)
           resolve();
-      });
+      }, { immediate: true });
     });
   }
   install(app) {
@@ -155,7 +164,6 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       this.loadedStorefront.value = true;
       if (!this.currentOrder.value.currency) {
         this.currentOrder.value.currency = latestStorefront.suggestedCurrency;
-        const _ = this.pushOrderContent();
       }
     }
   }
@@ -201,7 +209,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       couponsApplied: []
     };
     if (typeof window !== "undefined")
-      localStorage.setItem(_StorefrontContextImpl.sessionKey, JSON.stringify(this.currentOrder.value));
+      localStorage.removeItem(_StorefrontContextImpl.sessionKey);
   }
 };
 _StorefrontContextImpl.userKey = "moonbase_user";
@@ -214,8 +222,8 @@ __reExport(src_exports, require("@moonbase.sh/storefront-api"), module.exports);
 // src/composables/useBundle.ts
 var import_vue2 = require("vue");
-function useBundle(bundleId) {
-  const storefront = (0, import_vue2.inject)(storefrontKey);
+function useBundle(bundleId, context) {
+  const storefront = context != null ? context : (0, import_vue2.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return (0, import_vue2.computed)(() => storefront.storefront.value.bundles.find((b) => b.id === bundleId) || null);
@@ -223,8 +231,8 @@ function useBundle(bundleId) {
 // src/composables/useBundles.ts
 var import_vue3 = require("vue");
-function useBundles() {
-  const storefront = (0, import_vue3.inject)(storefrontKey);
+function useBundles(context) {
+  const storefront = context != null ? context : (0, import_vue3.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return (0, import_vue3.computed)(() => storefront.storefront.value.bundles);
@@ -232,8 +240,8 @@ function useBundles() {
 // src/composables/useProduct.ts
 var import_vue4 = require("vue");
-function useProduct(productId) {
-  const storefront = (0, import_vue4.inject)(storefrontKey);
+function useProduct(productId, context) {
+  const storefront = context != null ? context : (0, import_vue4.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return (0, import_vue4.computed)(() => storefront.storefront.value.products.find((p) => p.id === productId) || null);
@@ -241,8 +249,8 @@ function useProduct(productId) {
 // src/composables/useProducts.ts
 var import_vue5 = require("vue");
-function useProducts() {
-  const storefront = (0, import_vue5.inject)(storefrontKey);
+function useProducts(context) {
+  const storefront = context != null ? context : (0, import_vue5.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return (0, import_vue5.computed)(() => storefront.storefront.value.products);
@@ -250,8 +258,8 @@ function useProducts() {
 // src/composables/useInventory.ts
 var import_vue6 = require("vue");
-function useInventory() {
-  const storefront = (0, import_vue6.inject)(storefrontKey);
+function useInventory(context) {
+  const storefront = context != null ? context : (0, import_vue6.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -287,56 +295,93 @@ function useInventory() {
 // src/composables/useActivationRequest.ts
 var import_storefront_api2 = require("@moonbase.sh/storefront-api");
 var import_vue7 = require("vue");
-function useActivationRequest(requestId) {
-  const storefront = (0, import_vue7.inject)(storefrontKey);
+function useActivationRequest(token, context) {
+  const storefront = context != null ? context : (0, import_vue7.inject)(storefrontKey);
+  const requestId = (0, import_vue7.toValue)(token);
+  if (!requestId)
+    throw new Error("No request ID was given when calling `useActivationRequest`");
   if (!storefront)
     throw new Error("No storefront configured");
   const activationRequest = storefront.stateFactory(`activation-request-${requestId}`, null);
   const error = storefront.stateFactory(`activation-request-${requestId}-error`, null);
   const loading = storefront.stateFactory(`activation-request-${requestId}-loading`, true);
+  const fulfilling = storefront.stateFactory(`activation-request-${requestId}-fulfilling`, false);
+  const completing = storefront.stateFactory(`activation-request-${requestId}-completing`, false);
   const completionTimeout = storefront.stateFactory(`activation-request-${requestId}-completion-timeout`, null);
-  storefront.client.activationRequests.get(requestId).then((result) => {
-    activationRequest.value = result;
-    loading.value = false;
-  }).catch((e) => {
-    error.value = e;
+  const checkCompletion = async () => {
+    const completed = await storefront.client.activationRequests.isCompleted(requestId);
+    if (completed && activationRequest.value) {
+      activationRequest.value.status = import_storefront_api2.ActivationRequestStatus.Completed;
+      completing.value = false;
+    } else {
+      completionTimeout.value = setTimeout(checkCompletion, 1500);
+    }
+  };
+  if (requestId && requestId.length > 0) {
+    storefront.client.activationRequests.get(requestId).then((result) => {
+      activationRequest.value = result;
+      if (activationRequest.value.status === import_storefront_api2.ActivationRequestStatus.Fulfilled) {
+        completing.value = true;
+        checkCompletion();
+      }
+      loading.value = false;
+    }).catch((e) => {
+      error.value = e;
+      loading.value = false;
+    });
+  } else {
+    error.value = new Error("Missing request id");
     loading.value = false;
-  });
+  }
   (0, import_vue7.onBeforeUnmount)(() => {
     if (completionTimeout.value)
       clearTimeout(completionTimeout.value);
   });
   (0, import_vue7.watch)(storefront.currentUser, async () => {
+    var _a, _b;
+    if (!requestId || ((_b = (_a = activationRequest.value) == null ? void 0 : _a.licenseEligibility) == null ? void 0 : _b.eligible))
+      return;
     loading.value = true;
     try {
       activationRequest.value = await storefront.client.activationRequests.get(requestId);
+      if (activationRequest.value.status === import_storefront_api2.ActivationRequestStatus.Fulfilled) {
+        completing.value = true;
+        checkCompletion();
+      }
     } catch (e) {
       error.value = e;
     }
     loading.value = false;
   });
-  const checkCompletion = async () => {
-    const completed = await storefront.client.activationRequests.isCompleted(requestId);
-    if (completed && activationRequest.value)
-      activationRequest.value.status = import_storefront_api2.ActivationRequestStatus.Completed;
-    else
-      completionTimeout.value = setTimeout(checkCompletion, 1500);
-  };
   return {
     activationRequest,
     loading,
+    fulfilling,
+    completing,
     error,
     isInstalled: (0, import_vue7.computed)(() => {
       var _a;
       return activationRequest && ((_a = activationRequest.value) == null ? void 0 : _a.status) === import_storefront_api2.ActivationRequestStatus.Completed;
     }),
     fulfillLicense: async () => {
+      fulfilling.value = true;
       activationRequest.value = await storefront.client.activationRequests.fulfillLicense(requestId);
+      fulfilling.value = false;
+      completing.value = true;
       const _ = checkCompletion();
     },
     fulfillTrial: async () => {
+      fulfilling.value = true;
       activationRequest.value = await storefront.client.activationRequests.fulfillTrial(requestId);
+      fulfilling.value = false;
+      completing.value = true;
       const _ = checkCompletion();
+    },
+    cancel: async () => {
+      var _a;
+      if (((_a = activationRequest.value) == null ? void 0 : _a.status) === import_storefront_api2.ActivationRequestStatus.Cancelled)
+        return;
+      activationRequest.value = await storefront.client.activationRequests.cancel(requestId);
     }
   };
 }
@@ -344,8 +389,8 @@ function useActivationRequest(requestId) {
 // src/composables/useVoucher.ts
 var import_storefront_api3 = require("@moonbase.sh/storefront-api");
 var import_vue8 = require("vue");
-function useVoucher() {
-  const storefront = (0, import_vue8.inject)(storefrontKey);
+function useVoucher(context) {
+  const storefront = context != null ? context : (0, import_vue8.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -372,8 +417,8 @@ function useVoucher() {
 // src/composables/useCart.ts
 var import_vue9 = require("vue");
-function useCart() {
-  const storefront = (0, import_vue9.inject)(storefrontKey);
+function useCart(context) {
+  const storefront = context != null ? context : (0, import_vue9.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -491,8 +536,8 @@ function useCart() {
 // src/composables/useAuth.ts
 var import_vue10 = require("vue");
-function useAuth() {
-  const storefront = (0, import_vue10.inject)(storefrontKey);
+function useAuth(context) {
+  const storefront = context != null ? context : (0, import_vue10.inject)(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {

package/dist/index.d.cts CHANGED Viewed

@@ -1,9 +1,8 @@
 import * as _moonbase_sh_storefront_api from '@moonbase.sh/storefront-api';
-import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
+import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
 export * from '@moonbase.sh/storefront-api';
 import * as vue from 'vue';
 import { Plugin, Ref, App, UnwrapRef, InjectionKey } from 'vue';
-import * as _moonbase_sh_storefront_api_src from '@moonbase.sh/storefront-api/src';
 import { Address } from '@moonbase.sh/storefront-api/src';
 interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
@@ -11,13 +10,14 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     stateFactory: StateFactory;
     storefront: Ref<Storefront>;
     loadedStorefront: Ref<boolean>;
+    loadedStorefrontPromise: Promise<void>;
     currentOrder: Ref<Order>;
     currentUser: Ref<User | null>;
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
     client: MoonbaseClient;
-    updateStorefront(): Promise<void>;
-    pushOrderContent(): Promise<void>;
+    updateStorefront: () => Promise<void>;
+    pushOrderContent: () => Promise<void>;
     /**
      * Called automatically by `app.use(storefront)`. Should not be called manually by
      * the user.
@@ -25,19 +25,19 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
      * @internal
      * @param app - Application that uses the storefront
      */
-    install(app: App): any;
+    install: (app: App) => any;
 }
 type StateFactory = <T>(key: string, state: T) => Ref<T> | Ref<UnwrapRef<T>>;
-declare function useBundle(bundleId: string): Ref<StorefrontBundle | null>;
+declare function useBundle(bundleId: string, context?: StorefrontContext): Ref<StorefrontBundle | null>;
-declare function useBundles(): Ref<StorefrontBundle[]>;
+declare function useBundles(context?: StorefrontContext): Ref<StorefrontBundle[]>;
-declare function useProduct(productId: string): Ref<StorefrontProduct | null>;
+declare function useProduct(productId: string, context?: StorefrontContext): Ref<StorefrontProduct | null>;
-declare function useProducts(): Ref<StorefrontProduct[]>;
+declare function useProducts(context?: StorefrontContext): Ref<StorefrontProduct[]>;
-declare function useInventory(): {
+declare function useInventory(context?: StorefrontContext): {
     getLicenses: (nextUrl?: string) => Promise<_moonbase_sh_storefront_api.Page<{
         status: _moonbase_sh_storefront_api.LicenseStatus;
         id: string;
@@ -166,155 +166,20 @@ declare function useInventory(): {
     downloadProduct: (download: Download) => Promise<void>;
 };
-declare function useActivationRequest(requestId: string): {
-    activationRequest: vue.Ref<{
-        status: _moonbase_sh_storefront_api_src.ActivationRequestStatus;
-        id: string;
-        product: {
-            type: "product";
-            id: string;
-            name: string;
-            tagline: string;
-            iconUrl: string | null;
-            owned: boolean;
-            currentVersion?: string | undefined;
-            downloads?: {
-                name: string;
-                path: string | null;
-                key: string;
-                platform: _moonbase_sh_storefront_api_src.Platform;
-                size: number;
-            }[] | undefined;
-            defaultVariation?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            } | undefined;
-            variations?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            }[] | undefined;
-        };
-        trialEligibility?: {
-            eligible: boolean;
-            existing: boolean;
-            requiresAccount: boolean;
-            numberOfDaysPerProduct: number;
-            numberOfDaysRemaining: number;
-        } | undefined;
-        licenseEligibility?: {
-            eligible: boolean;
-        } | undefined;
-    } | null> | vue.Ref<{
-        status: _moonbase_sh_storefront_api_src.ActivationRequestStatus;
-        id: string;
-        product: {
-            type: "product";
-            id: string;
-            name: string;
-            tagline: string;
-            iconUrl: string | null;
-            owned: boolean;
-            currentVersion?: string | undefined;
-            downloads?: {
-                name: string;
-                path: string | null;
-                key: string;
-                platform: _moonbase_sh_storefront_api_src.Platform;
-                size: number;
-            }[] | undefined;
-            defaultVariation?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            } | undefined;
-            variations?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            }[] | undefined;
-        };
-        trialEligibility?: {
-            eligible: boolean;
-            existing: boolean;
-            requiresAccount: boolean;
-            numberOfDaysPerProduct: number;
-            numberOfDaysRemaining: number;
-        } | undefined;
-        licenseEligibility?: {
-            eligible: boolean;
-        } | undefined;
-    } | null>;
-    loading: vue.Ref<boolean>;
-    error: vue.Ref<Error | null> | vue.Ref<{
-        name: string;
-        message: string;
-        stack?: string | undefined;
-        cause?: unknown;
-    } | null>;
-    isInstalled: vue.ComputedRef<boolean>;
+interface ActivationRequestComposable {
+    activationRequest: Ref<null | ActivationRequest>;
+    loading: Ref<boolean>;
+    fulfilling: Ref<boolean>;
+    completing: Ref<boolean>;
+    error: Ref<null | Error>;
+    isInstalled: Ref<boolean>;
     fulfillLicense: () => Promise<void>;
     fulfillTrial: () => Promise<void>;
-};
+    cancel: () => Promise<void>;
+}
+declare function useActivationRequest(token: string | Ref<string>, context?: StorefrontContext): ActivationRequestComposable;
-declare function useVoucher(): {
+declare function useVoucher(context?: StorefrontContext): {
     peek: (code: string) => Promise<{
         code: string;
         id: string;
@@ -329,6 +194,7 @@ declare function useVoucher(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -394,6 +260,7 @@ declare function useVoucher(): {
                     tagline: string;
                     iconUrl: string | null;
                     owned: boolean;
+                    website?: string | null | undefined;
                     currentVersion?: string | undefined;
                     downloads?: {
                         path: string | null;
@@ -499,6 +366,7 @@ declare function useVoucher(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -564,6 +432,7 @@ declare function useVoucher(): {
                     tagline: string;
                     iconUrl: string | null;
                     owned: boolean;
+                    website?: string | null | undefined;
                     currentVersion?: string | undefined;
                     downloads?: {
                         path: string | null;
@@ -657,7 +526,7 @@ declare function useVoucher(): {
     }>;
 };
-declare function useCart(): {
+declare function useCart(context?: StorefrontContext): {
     items: vue.ComputedRef<({
         type: "Product";
         id: string;
@@ -691,6 +560,7 @@ declare function useCart(): {
             tagline: string;
             iconUrl: string | null;
             owned: boolean;
+            website?: string | null | undefined;
             currentVersion?: string | undefined;
             downloads?: {
                 path: string | null;
@@ -793,6 +663,7 @@ declare function useCart(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -907,7 +778,7 @@ declare function useCart(): {
     checkout: (returnUrl: string) => Promise<void>;
 };
-declare function useAuth(): {
+declare function useAuth(context?: StorefrontContext): {
     user: vue.Ref<{
         id: string;
         email: string;
@@ -989,4 +860,4 @@ interface Cart {
 type CartItem = LineItem;
 declare function createStorefront(endpoint: string, stateFactory?: StateFactory): StorefrontContext;
-export { type Cart, type CartItem, createStorefront, storefrontKey, useActivationRequest, useAuth, useBundle, useBundles, useCart, useInventory, useProduct, useProducts, useVoucher };
+export { type ActivationRequestComposable, type Cart, type CartItem, createStorefront, storefrontKey, useActivationRequest, useAuth, useBundle, useBundles, useCart, useInventory, useProduct, useProducts, useVoucher };

package/dist/index.d.ts CHANGED Viewed

@@ -1,9 +1,8 @@
 import * as _moonbase_sh_storefront_api from '@moonbase.sh/storefront-api';
-import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
+import { MoonbaseConfiguration, Storefront, Order, User, MoonbaseClient, StorefrontBundle, StorefrontProduct, ActivationMethod, Activation, Download, ActivationRequest, PricingVariation, CommunicationPreferences, LineItem } from '@moonbase.sh/storefront-api';
 export * from '@moonbase.sh/storefront-api';
 import * as vue from 'vue';
 import { Plugin, Ref, App, UnwrapRef, InjectionKey } from 'vue';
-import * as _moonbase_sh_storefront_api_src from '@moonbase.sh/storefront-api/src';
 import { Address } from '@moonbase.sh/storefront-api/src';
 interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
@@ -11,13 +10,14 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
     stateFactory: StateFactory;
     storefront: Ref<Storefront>;
     loadedStorefront: Ref<boolean>;
+    loadedStorefrontPromise: Promise<void>;
     currentOrder: Ref<Order>;
     currentUser: Ref<User | null>;
     loadedUser: Ref<boolean>;
     loadedUserPromise: Promise<void>;
     client: MoonbaseClient;
-    updateStorefront(): Promise<void>;
-    pushOrderContent(): Promise<void>;
+    updateStorefront: () => Promise<void>;
+    pushOrderContent: () => Promise<void>;
     /**
      * Called automatically by `app.use(storefront)`. Should not be called manually by
      * the user.
@@ -25,19 +25,19 @@ interface StorefrontContext extends Pick<Plugin, keyof Plugin> {
      * @internal
      * @param app - Application that uses the storefront
      */
-    install(app: App): any;
+    install: (app: App) => any;
 }
 type StateFactory = <T>(key: string, state: T) => Ref<T> | Ref<UnwrapRef<T>>;
-declare function useBundle(bundleId: string): Ref<StorefrontBundle | null>;
+declare function useBundle(bundleId: string, context?: StorefrontContext): Ref<StorefrontBundle | null>;
-declare function useBundles(): Ref<StorefrontBundle[]>;
+declare function useBundles(context?: StorefrontContext): Ref<StorefrontBundle[]>;
-declare function useProduct(productId: string): Ref<StorefrontProduct | null>;
+declare function useProduct(productId: string, context?: StorefrontContext): Ref<StorefrontProduct | null>;
-declare function useProducts(): Ref<StorefrontProduct[]>;
+declare function useProducts(context?: StorefrontContext): Ref<StorefrontProduct[]>;
-declare function useInventory(): {
+declare function useInventory(context?: StorefrontContext): {
     getLicenses: (nextUrl?: string) => Promise<_moonbase_sh_storefront_api.Page<{
         status: _moonbase_sh_storefront_api.LicenseStatus;
         id: string;
@@ -166,155 +166,20 @@ declare function useInventory(): {
     downloadProduct: (download: Download) => Promise<void>;
 };
-declare function useActivationRequest(requestId: string): {
-    activationRequest: vue.Ref<{
-        status: _moonbase_sh_storefront_api_src.ActivationRequestStatus;
-        id: string;
-        product: {
-            type: "product";
-            id: string;
-            name: string;
-            tagline: string;
-            iconUrl: string | null;
-            owned: boolean;
-            currentVersion?: string | undefined;
-            downloads?: {
-                name: string;
-                path: string | null;
-                key: string;
-                platform: _moonbase_sh_storefront_api_src.Platform;
-                size: number;
-            }[] | undefined;
-            defaultVariation?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            } | undefined;
-            variations?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            }[] | undefined;
-        };
-        trialEligibility?: {
-            eligible: boolean;
-            existing: boolean;
-            requiresAccount: boolean;
-            numberOfDaysPerProduct: number;
-            numberOfDaysRemaining: number;
-        } | undefined;
-        licenseEligibility?: {
-            eligible: boolean;
-        } | undefined;
-    } | null> | vue.Ref<{
-        status: _moonbase_sh_storefront_api_src.ActivationRequestStatus;
-        id: string;
-        product: {
-            type: "product";
-            id: string;
-            name: string;
-            tagline: string;
-            iconUrl: string | null;
-            owned: boolean;
-            currentVersion?: string | undefined;
-            downloads?: {
-                name: string;
-                path: string | null;
-                key: string;
-                platform: _moonbase_sh_storefront_api_src.Platform;
-                size: number;
-            }[] | undefined;
-            defaultVariation?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            } | undefined;
-            variations?: {
-                id: string;
-                price: Record<string, number>;
-                name: string;
-                originalPrice: Record<string, number>;
-                hasDiscount: boolean;
-                discount?: {
-                    type: "PercentageOffDiscount";
-                    name: string;
-                    percentage: number;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | {
-                    type: "FlatAmountOffDiscount";
-                    name: string;
-                    total: Record<string, number>;
-                    description?: string | undefined;
-                } | undefined;
-            }[] | undefined;
-        };
-        trialEligibility?: {
-            eligible: boolean;
-            existing: boolean;
-            requiresAccount: boolean;
-            numberOfDaysPerProduct: number;
-            numberOfDaysRemaining: number;
-        } | undefined;
-        licenseEligibility?: {
-            eligible: boolean;
-        } | undefined;
-    } | null>;
-    loading: vue.Ref<boolean>;
-    error: vue.Ref<Error | null> | vue.Ref<{
-        name: string;
-        message: string;
-        stack?: string | undefined;
-        cause?: unknown;
-    } | null>;
-    isInstalled: vue.ComputedRef<boolean>;
+interface ActivationRequestComposable {
+    activationRequest: Ref<null | ActivationRequest>;
+    loading: Ref<boolean>;
+    fulfilling: Ref<boolean>;
+    completing: Ref<boolean>;
+    error: Ref<null | Error>;
+    isInstalled: Ref<boolean>;
     fulfillLicense: () => Promise<void>;
     fulfillTrial: () => Promise<void>;
-};
+    cancel: () => Promise<void>;
+}
+declare function useActivationRequest(token: string | Ref<string>, context?: StorefrontContext): ActivationRequestComposable;
-declare function useVoucher(): {
+declare function useVoucher(context?: StorefrontContext): {
     peek: (code: string) => Promise<{
         code: string;
         id: string;
@@ -329,6 +194,7 @@ declare function useVoucher(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -394,6 +260,7 @@ declare function useVoucher(): {
                     tagline: string;
                     iconUrl: string | null;
                     owned: boolean;
+                    website?: string | null | undefined;
                     currentVersion?: string | undefined;
                     downloads?: {
                         path: string | null;
@@ -499,6 +366,7 @@ declare function useVoucher(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -564,6 +432,7 @@ declare function useVoucher(): {
                     tagline: string;
                     iconUrl: string | null;
                     owned: boolean;
+                    website?: string | null | undefined;
                     currentVersion?: string | undefined;
                     downloads?: {
                         path: string | null;
@@ -657,7 +526,7 @@ declare function useVoucher(): {
     }>;
 };
-declare function useCart(): {
+declare function useCart(context?: StorefrontContext): {
     items: vue.ComputedRef<({
         type: "Product";
         id: string;
@@ -691,6 +560,7 @@ declare function useCart(): {
             tagline: string;
             iconUrl: string | null;
             owned: boolean;
+            website?: string | null | undefined;
             currentVersion?: string | undefined;
             downloads?: {
                 path: string | null;
@@ -793,6 +663,7 @@ declare function useCart(): {
                 tagline: string;
                 iconUrl: string | null;
                 owned: boolean;
+                website?: string | null | undefined;
                 currentVersion?: string | undefined;
                 downloads?: {
                     path: string | null;
@@ -907,7 +778,7 @@ declare function useCart(): {
     checkout: (returnUrl: string) => Promise<void>;
 };
-declare function useAuth(): {
+declare function useAuth(context?: StorefrontContext): {
     user: vue.Ref<{
         id: string;
         email: string;
@@ -989,4 +860,4 @@ interface Cart {
 type CartItem = LineItem;
 declare function createStorefront(endpoint: string, stateFactory?: StateFactory): StorefrontContext;
-export { type Cart, type CartItem, createStorefront, storefrontKey, useActivationRequest, useAuth, useBundle, useBundles, useCart, useInventory, useProduct, useProducts, useVoucher };
+export { type ActivationRequestComposable, type Cart, type CartItem, createStorefront, storefrontKey, useActivationRequest, useAuth, useBundle, useBundles, useCart, useInventory, useProduct, useProducts, useVoucher };

package/dist/index.js CHANGED Viewed

@@ -62,9 +62,11 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     window.addEventListener("storage", (event) => this.handleStorageUpdate(event));
     const cachedOrderJson = localStorage.getItem(_StorefrontContextImpl.sessionKey);
     if (cachedOrderJson) {
+      console.log("Found cached session:", cachedOrderJson);
       this.currentOrder = ref(JSON.parse(cachedOrderJson));
       const _1 = this.refreshOrder();
     } else {
+      console.log("No cached session found");
       this.currentOrder = ref({
         id: uuidv4(),
         status: OrderStatus.Open,
@@ -72,7 +74,6 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
         items: [],
         couponsApplied: []
       });
-      localStorage.setItem(_StorefrontContextImpl.sessionKey, JSON.stringify(this.currentOrder.value));
     }
     const cachedStorefrontJson = localStorage.getItem(_StorefrontContextImpl.storefrontKey);
     if (cachedStorefrontJson) {
@@ -89,12 +90,20 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
     const _2 = this.updateStorefront();
     const _3 = this.updateUser();
   }
+  get loadedStorefrontPromise() {
+    return new Promise((resolve) => {
+      watch(this.loadedStorefront, (isLoaded) => {
+        if (isLoaded)
+          resolve();
+      }, { immediate: true });
+    });
+  }
   get loadedUserPromise() {
     return new Promise((resolve) => {
       watch(this.loadedUser, (isLoaded) => {
         if (isLoaded)
           resolve();
-      });
+      }, { immediate: true });
     });
   }
   install(app) {
@@ -120,7 +129,6 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       this.loadedStorefront.value = true;
       if (!this.currentOrder.value.currency) {
         this.currentOrder.value.currency = latestStorefront.suggestedCurrency;
-        const _ = this.pushOrderContent();
       }
     }
   }
@@ -166,7 +174,7 @@ var _StorefrontContextImpl = class _StorefrontContextImpl {
       couponsApplied: []
     };
     if (typeof window !== "undefined")
-      localStorage.setItem(_StorefrontContextImpl.sessionKey, JSON.stringify(this.currentOrder.value));
+      localStorage.removeItem(_StorefrontContextImpl.sessionKey);
   }
 };
 _StorefrontContextImpl.userKey = "moonbase_user";
@@ -179,8 +187,8 @@ export * from "@moonbase.sh/storefront-api";
 // src/composables/useBundle.ts
 import { computed as computed2, inject } from "vue";
-function useBundle(bundleId) {
-  const storefront = inject(storefrontKey);
+function useBundle(bundleId, context) {
+  const storefront = context != null ? context : inject(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return computed2(() => storefront.storefront.value.bundles.find((b) => b.id === bundleId) || null);
@@ -188,8 +196,8 @@ function useBundle(bundleId) {
 // src/composables/useBundles.ts
 import { computed as computed3, inject as inject2 } from "vue";
-function useBundles() {
-  const storefront = inject2(storefrontKey);
+function useBundles(context) {
+  const storefront = context != null ? context : inject2(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return computed3(() => storefront.storefront.value.bundles);
@@ -197,8 +205,8 @@ function useBundles() {
 // src/composables/useProduct.ts
 import { computed as computed4, inject as inject3 } from "vue";
-function useProduct(productId) {
-  const storefront = inject3(storefrontKey);
+function useProduct(productId, context) {
+  const storefront = context != null ? context : inject3(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return computed4(() => storefront.storefront.value.products.find((p) => p.id === productId) || null);
@@ -206,8 +214,8 @@ function useProduct(productId) {
 // src/composables/useProducts.ts
 import { computed as computed5, inject as inject4 } from "vue";
-function useProducts() {
-  const storefront = inject4(storefrontKey);
+function useProducts(context) {
+  const storefront = context != null ? context : inject4(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return computed5(() => storefront.storefront.value.products);
@@ -215,8 +223,8 @@ function useProducts() {
 // src/composables/useInventory.ts
 import { inject as inject5 } from "vue";
-function useInventory() {
-  const storefront = inject5(storefrontKey);
+function useInventory(context) {
+  const storefront = context != null ? context : inject5(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -251,57 +259,94 @@ function useInventory() {
 // src/composables/useActivationRequest.ts
 import { ActivationRequestStatus } from "@moonbase.sh/storefront-api";
-import { computed as computed6, inject as inject6, onBeforeUnmount, watch as watch2 } from "vue";
-function useActivationRequest(requestId) {
-  const storefront = inject6(storefrontKey);
+import { computed as computed6, inject as inject6, onBeforeUnmount, toValue, watch as watch2 } from "vue";
+function useActivationRequest(token, context) {
+  const storefront = context != null ? context : inject6(storefrontKey);
+  const requestId = toValue(token);
+  if (!requestId)
+    throw new Error("No request ID was given when calling `useActivationRequest`");
   if (!storefront)
     throw new Error("No storefront configured");
   const activationRequest = storefront.stateFactory(`activation-request-${requestId}`, null);
   const error = storefront.stateFactory(`activation-request-${requestId}-error`, null);
   const loading = storefront.stateFactory(`activation-request-${requestId}-loading`, true);
+  const fulfilling = storefront.stateFactory(`activation-request-${requestId}-fulfilling`, false);
+  const completing = storefront.stateFactory(`activation-request-${requestId}-completing`, false);
   const completionTimeout = storefront.stateFactory(`activation-request-${requestId}-completion-timeout`, null);
-  storefront.client.activationRequests.get(requestId).then((result) => {
-    activationRequest.value = result;
-    loading.value = false;
-  }).catch((e) => {
-    error.value = e;
+  const checkCompletion = async () => {
+    const completed = await storefront.client.activationRequests.isCompleted(requestId);
+    if (completed && activationRequest.value) {
+      activationRequest.value.status = ActivationRequestStatus.Completed;
+      completing.value = false;
+    } else {
+      completionTimeout.value = setTimeout(checkCompletion, 1500);
+    }
+  };
+  if (requestId && requestId.length > 0) {
+    storefront.client.activationRequests.get(requestId).then((result) => {
+      activationRequest.value = result;
+      if (activationRequest.value.status === ActivationRequestStatus.Fulfilled) {
+        completing.value = true;
+        checkCompletion();
+      }
+      loading.value = false;
+    }).catch((e) => {
+      error.value = e;
+      loading.value = false;
+    });
+  } else {
+    error.value = new Error("Missing request id");
     loading.value = false;
-  });
+  }
   onBeforeUnmount(() => {
     if (completionTimeout.value)
       clearTimeout(completionTimeout.value);
   });
   watch2(storefront.currentUser, async () => {
+    var _a, _b;
+    if (!requestId || ((_b = (_a = activationRequest.value) == null ? void 0 : _a.licenseEligibility) == null ? void 0 : _b.eligible))
+      return;
     loading.value = true;
     try {
       activationRequest.value = await storefront.client.activationRequests.get(requestId);
+      if (activationRequest.value.status === ActivationRequestStatus.Fulfilled) {
+        completing.value = true;
+        checkCompletion();
+      }
     } catch (e) {
       error.value = e;
     }
     loading.value = false;
   });
-  const checkCompletion = async () => {
-    const completed = await storefront.client.activationRequests.isCompleted(requestId);
-    if (completed && activationRequest.value)
-      activationRequest.value.status = ActivationRequestStatus.Completed;
-    else
-      completionTimeout.value = setTimeout(checkCompletion, 1500);
-  };
   return {
     activationRequest,
     loading,
+    fulfilling,
+    completing,
     error,
     isInstalled: computed6(() => {
       var _a;
       return activationRequest && ((_a = activationRequest.value) == null ? void 0 : _a.status) === ActivationRequestStatus.Completed;
     }),
     fulfillLicense: async () => {
+      fulfilling.value = true;
       activationRequest.value = await storefront.client.activationRequests.fulfillLicense(requestId);
+      fulfilling.value = false;
+      completing.value = true;
       const _ = checkCompletion();
     },
     fulfillTrial: async () => {
+      fulfilling.value = true;
       activationRequest.value = await storefront.client.activationRequests.fulfillTrial(requestId);
+      fulfilling.value = false;
+      completing.value = true;
       const _ = checkCompletion();
+    },
+    cancel: async () => {
+      var _a;
+      if (((_a = activationRequest.value) == null ? void 0 : _a.status) === ActivationRequestStatus.Cancelled)
+        return;
+      activationRequest.value = await storefront.client.activationRequests.cancel(requestId);
     }
   };
 }
@@ -309,8 +354,8 @@ function useActivationRequest(requestId) {
 // src/composables/useVoucher.ts
 import { NotFoundError } from "@moonbase.sh/storefront-api";
 import { inject as inject7 } from "vue";
-function useVoucher() {
-  const storefront = inject7(storefrontKey);
+function useVoucher(context) {
+  const storefront = context != null ? context : inject7(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -337,8 +382,8 @@ function useVoucher() {
 // src/composables/useCart.ts
 import { computed as computed7, inject as inject8, unref } from "vue";
-function useCart() {
-  const storefront = inject8(storefrontKey);
+function useCart(context) {
+  const storefront = context != null ? context : inject8(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {
@@ -456,8 +501,8 @@ function useCart() {
 // src/composables/useAuth.ts
 import { inject as inject9 } from "vue";
-function useAuth() {
-  const storefront = inject9(storefrontKey);
+function useAuth(context) {
+  const storefront = context != null ? context : inject9(storefrontKey);
   if (!storefront)
     throw new Error("No storefront configured");
   return {

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/vue",
   "type": "module",
-  "version": "0.1.123",
+  "version": "0.2.1",
   "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",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@vue/devtools-api": "^6.5.1",
     "uuid": "^9.0.1",
-    "@moonbase.sh/storefront-api": "0.1.123"
+    "@moonbase.sh/storefront-api": "0.2.1"
   },
   "devDependencies": {
     "@types/uuid": "^9.0.7",