@moonbase.sh/storefront-api 0.4.26 → 0.4.31

package/dist/index.cjs

@@ -53,6 +53,7 @@ __export(index_exports, {
   Platform: () => Platform,
   SubscriptionStatus: () => SubscriptionStatus,
   TokenStore: () => TokenStore,
+  objectToQuery: () => objectToQuery,
   problemDetailsSchema: () => problemDetailsSchema,
   schemas: () => schemas_exports3,
   utmToObject: () => utmToObject
@@ -251,6 +252,8 @@ var storefrontOfferSchema = import_zod3.z.object({
 });
 var storefrontSchema = import_zod3.z.object({
   suggestedCurrency: import_zod3.z.string(),
+  // Enabled currencies need to be optional since we may still have old, cached representations in browsers
+  enabledCurrencies: import_zod3.z.string().array().optional(),
   products: storefrontProductSchema.array(),
   bundles: storefrontBundleSchema.array(),
   // Offers need to be optional since we may still have old, cached representations in browsers
@@ -678,6 +681,132 @@ var ProductEndpoints = class {
   }
 };
 
+// src/utils/api.ts
+var import_cross_fetch2 = __toESM(require("cross-fetch"), 1);
+function objectToQuery(obj) {
+  return Object.entries(obj != null ? obj : {}).filter(([_, value]) => value !== void 0).map(([key, value]) => `${key}=${encodeURIComponent(value instanceof Date ? value.toISOString() : value)}`).join("&");
+}
+var MoonbaseApi = class {
+  constructor(baseUrl, tokenStore, logger) {
+    this.baseUrl = baseUrl;
+    this.tokenStore = tokenStore;
+    this.logger = logger;
+  }
+  async authenticatedFetch(path, schema, options) {
+    if (!this.tokenStore.user)
+      throw new NotAuthenticatedError();
+    return await this.fetch(path, schema, options);
+  }
+  async fetch(path, schema, options) {
+    var _a;
+    const accessToken = await this.tokenStore.getAccessToken();
+    const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
+    this.logger.debug("Making request to Moonbase API...", {
+      path,
+      body: options == null ? void 0 : options.body
+    });
+    const startedAt = /* @__PURE__ */ new Date();
+    const request = {
+      method: (options == null ? void 0 : options.method) || "GET",
+      mode: "cors",
+      headers: {
+        "Accept": "application/json",
+        "Content-Type": contentType,
+        // While this fetch can be anonymous, we add the token if we have it
+        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
+        // Force CORS on all calls
+        "x-mb-cors": "1"
+      },
+      body: (options == null ? void 0 : options.body) ? contentType !== "application/json" ? options.body : JSON.stringify(options.body) : void 0,
+      signal: options == null ? void 0 : options.abort,
+      redirect: "manual"
+    };
+    const response = await (0, import_cross_fetch2.default)(this.baseUrl + path, request);
+    const finishedAt = /* @__PURE__ */ new Date();
+    this.logger.debug("Received response from Moonbase", {
+      path,
+      status: response.status,
+      duration: finishedAt.getTime() - startedAt.getTime()
+    });
+    if (response.status >= 400) {
+      try {
+        await handleResponseProblem(response, this.logger);
+      } catch (err) {
+        this.reportRequestProblem(path, request, response, err);
+        throw err;
+      }
+    }
+    let json;
+    try {
+      json = schema ? await response.json() : null;
+      return {
+        data: schema ? schema.parse(json) : null,
+        headers: Object.fromEntries(response.headers.entries()),
+        status: response.status
+      };
+    } catch (err) {
+      this.logger.warn("Could not parse response", {
+        status: response.status,
+        path,
+        content: json || (response.bodyUsed ? "unknown" : await response.text()),
+        headers: Object.fromEntries(response.headers.entries()),
+        userAgent: window && window.navigator && window.navigator.userAgent,
+        err
+      });
+      this.reportParsingProblem(path, err, json || (response.bodyUsed ? "unknown" : await response.text()));
+      throw new MoonbaseError("Bad response", "Could not parse server response", response.status);
+    }
+  }
+  async reportParsingProblem(path, err, body) {
+    try {
+      await (0, import_cross_fetch2.default)(`${this.baseUrl}/api/customer/insights/error`, {
+        mode: "cors",
+        method: "POST",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          title: "Parse error",
+          detail: `Could not parse response body`,
+          path,
+          origin: window == null ? void 0 : window.location.href,
+          userAgent: window && window.navigator && window.navigator.userAgent,
+          err,
+          body
+        })
+      });
+    } catch (e) {
+    }
+  }
+  async reportRequestProblem(path, request, response, err) {
+    try {
+      await (0, import_cross_fetch2.default)(`${this.baseUrl}/api/customer/insights/warn`, {
+        mode: "cors",
+        method: "POST",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          title: "Request error",
+          detail: `Request failed with status ${response.status}`,
+          status: response.status,
+          request: {
+            ...request,
+            headers: void 0,
+            body: void 0
+          },
+          error: err,
+          path,
+          origin: window == null ? void 0 : window.location.href
+        })
+      });
+    } catch (e) {
+    }
+  }
+};
+
 // src/inventory/subscriptions/endpoints.ts
 var import_zod13 = require("zod");
 
@@ -838,6 +967,8 @@ var subscriptionSchema = import_zod12.z.object({
   startedAt: import_zod12.z.coerce.date(),
   total: orderTotalSchema,
   cycleLength: import_zod12.z.nativeEnum(CycleLength),
+  paymentMethod: import_zod12.z.string().optional(),
+  embeddedUpdatePaymentUrl: import_zod12.z.string().optional(),
   content: import_zod12.z.discriminatedUnion("type", [
     import_zod12.z.object({
       type: import_zod12.z.literal("Product"),
@@ -862,8 +993,8 @@ var SubscriptionEndpoints = class {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/inventory/subscriptions", paged(subscriptionSchema));
     return response.data;
   }
-  async getById(subscriptionId) {
-    const response = await this.api.authenticatedFetch(`/api/customer/inventory/subscriptions/${subscriptionId}`, subscriptionSchema);
+  async getById(subscriptionId, options) {
+    const response = await this.api.authenticatedFetch(`/api/customer/inventory/subscriptions/${subscriptionId}?${objectToQuery(options)}`, subscriptionSchema);
     return response.data;
   }
   async cancel(subscriptionId) {
@@ -954,129 +1085,6 @@ var StorefrontEndpoints = class {
   }
 };
 
-// src/utils/api.ts
-var import_cross_fetch2 = __toESM(require("cross-fetch"), 1);
-var MoonbaseApi = class {
-  constructor(baseUrl, tokenStore, logger) {
-    this.baseUrl = baseUrl;
-    this.tokenStore = tokenStore;
-    this.logger = logger;
-  }
-  async authenticatedFetch(path, schema, options) {
-    if (!this.tokenStore.user)
-      throw new NotAuthenticatedError();
-    return await this.fetch(path, schema, options);
-  }
-  async fetch(path, schema, options) {
-    var _a;
-    const accessToken = await this.tokenStore.getAccessToken();
-    const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
-    this.logger.debug("Making request to Moonbase API...", {
-      path,
-      body: options == null ? void 0 : options.body
-    });
-    const startedAt = /* @__PURE__ */ new Date();
-    const request = {
-      method: (options == null ? void 0 : options.method) || "GET",
-      mode: "cors",
-      headers: {
-        "Accept": "application/json",
-        "Content-Type": contentType,
-        // While this fetch can be anonymous, we add the token if we have it
-        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
-        // Force CORS on all calls
-        "x-mb-cors": "1"
-      },
-      body: (options == null ? void 0 : options.body) ? contentType !== "application/json" ? options.body : JSON.stringify(options.body) : void 0,
-      signal: options == null ? void 0 : options.abort,
-      redirect: "manual"
-    };
-    const response = await (0, import_cross_fetch2.default)(this.baseUrl + path, request);
-    const finishedAt = /* @__PURE__ */ new Date();
-    this.logger.debug("Received response from Moonbase", {
-      path,
-      status: response.status,
-      duration: finishedAt.getTime() - startedAt.getTime()
-    });
-    if (response.status >= 400) {
-      try {
-        await handleResponseProblem(response, this.logger);
-      } catch (err) {
-        this.reportRequestProblem(path, request, response, err);
-        throw err;
-      }
-    }
-    let json;
-    try {
-      json = schema ? await response.json() : null;
-      return {
-        data: schema ? schema.parse(json) : null,
-        headers: Object.fromEntries(response.headers.entries()),
-        status: response.status
-      };
-    } catch (err) {
-      this.logger.warn("Could not parse response", {
-        status: response.status,
-        path,
-        content: json || (response.bodyUsed ? "unknown" : await response.text()),
-        headers: Object.fromEntries(response.headers.entries()),
-        userAgent: window && window.navigator && window.navigator.userAgent,
-        err
-      });
-      this.reportParsingProblem(path, err, json || (response.bodyUsed ? "unknown" : await response.text()));
-      throw new MoonbaseError("Bad response", "Could not parse server response", response.status);
-    }
-  }
-  async reportParsingProblem(path, err, body) {
-    try {
-      await (0, import_cross_fetch2.default)(`${this.baseUrl}/api/customer/insights/error`, {
-        mode: "cors",
-        method: "POST",
-        headers: {
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          title: "Parse error",
-          detail: `Could not parse response body`,
-          path,
-          origin: window == null ? void 0 : window.location.href,
-          userAgent: window && window.navigator && window.navigator.userAgent,
-          err,
-          body
-        })
-      });
-    } catch (e) {
-    }
-  }
-  async reportRequestProblem(path, request, response, err) {
-    try {
-      await (0, import_cross_fetch2.default)(`${this.baseUrl}/api/customer/insights/warn`, {
-        mode: "cors",
-        method: "POST",
-        headers: {
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          title: "Request error",
-          detail: `Request failed with status ${response.status}`,
-          status: response.status,
-          request: {
-            ...request,
-            headers: void 0,
-            body: void 0
-          },
-          error: err,
-          path,
-          origin: window == null ? void 0 : window.location.href
-        })
-      });
-    } catch (e) {
-    }
-  }
-};
-
 // src/utils/tokenStore.ts
 var import_cross_fetch3 = __toESM(require("cross-fetch"), 1);
 
@@ -1356,10 +1364,16 @@ var OfferUtils = class {
     switch (offer.condition.type) {
       case "CartContainsItems":
         const relevantItems = order.items.filter(
-          (i) => i.type === "Product" && offer.condition.relevantItemVariations[`Product/${i.productId}`] && (offer.condition.relevantItemVariations[`Product/${i.productId}`].length === 0 || offer.condition.relevantItemVariations[`Product/${i.productId}`].includes(i.variationId)) || i.type === "Bundle" && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`] && (offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].length === 0 || offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].includes(i.variationId))
+          (i) => i.type === "Product" && offer.condition.relevantItemVariations[`Product/${i.productId}`] && offer.condition.relevantItemVariations[`Product/${i.productId}`].includes(i.variationId) || i.type === "Bundle" && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`] && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].includes(i.variationId)
         );
-        console.log("Relevant items for offer:", { offer, relevantItems });
-        return relevantItems.length >= offer.condition.minimumItems;
+        const relevantReplacedItems = order.items.flatMap((i) => {
+          var _a;
+          return i.type === "Bundle" && offer.target.type === "Bundle" && offer.target.id === i.bundleId && offer.id === i.offerId ? (_a = i.replaced) != null ? _a : [] : [];
+        }).filter((ref) => {
+          const [productId, variationId] = ref.split("/");
+          return offer.condition.relevantItemVariations[`Product/${productId}`] && offer.condition.relevantItemVariations[`Product/${productId}`].includes(variationId);
+        });
+        return relevantItems.length + relevantReplacedItems.length >= offer.condition.minimumItems;
     }
     console.warn("Unsupported offer condition found:", offer.condition);
     return false;
@@ -1417,6 +1431,7 @@ var MoonbaseClient = class {
   Platform,
   SubscriptionStatus,
   TokenStore,
+  objectToQuery,
   problemDetailsSchema,
   schemas,
   utmToObject

package/dist/index.d.cts

@@ -59,6 +59,7 @@ interface FetchOptions {
     contentType?: string;
     abort?: AbortSignal;
 }
+declare function objectToQuery(obj?: Record<string, string | number | boolean | Date>): string;
 declare class MoonbaseApi {
     baseUrl: string;
     private tokenStore;
@@ -2084,6 +2085,8 @@ declare const subscriptionSchema: z.ZodObject<{
         };
     }>;
     cycleLength: z.ZodNativeEnum<typeof CycleLength>;
+    paymentMethod: z.ZodOptional<z.ZodString>;
+    embeddedUpdatePaymentUrl: z.ZodOptional<z.ZodString>;
     content: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"Product">;
         quantity: z.ZodNumber;
@@ -4694,6 +4697,8 @@ declare const subscriptionSchema: z.ZodObject<{
             }[] | undefined;
         };
     };
+    paymentMethod?: string | undefined;
+    embeddedUpdatePaymentUrl?: string | undefined;
 }, {
     id: string;
     status: SubscriptionStatus;
@@ -4999,6 +5004,8 @@ declare const subscriptionSchema: z.ZodObject<{
             }[] | undefined;
         };
     };
+    paymentMethod?: string | undefined;
+    embeddedUpdatePaymentUrl?: string | undefined;
 }>;
 
 declare enum SubscriptionStatus {
@@ -5013,7 +5020,10 @@ declare class SubscriptionEndpoints {
     private readonly configuration;
     constructor(api: MoonbaseApi, configuration: MoonbaseConfiguration);
     get(nextUrl?: string): Promise<Page<Subscription>>;
-    getById(subscriptionId: string): Promise<Subscription>;
+    getById(subscriptionId: string, options?: {
+        toUpdatePaymentMethod?: boolean;
+        returnUrl?: string;
+    }): Promise<Subscription>;
     cancel(subscriptionId: string): Promise<Subscription>;
     renew(subscriptionId: string, returnUrl: string, embedded: boolean): Promise<{
         location: string;
@@ -19350,6 +19360,7 @@ declare class StorefrontEndpoints {
                 }[] | null | undefined;
             }[] | undefined;
         }[];
+        enabledCurrencies?: string[] | undefined;
         offers?: {
             id: string;
             discount: {
@@ -26726,6 +26737,7 @@ declare const storefrontOfferSchema: z.ZodObject<{
 }>;
 declare const storefrontSchema: z.ZodObject<{
     suggestedCurrency: z.ZodString;
+    enabledCurrencies: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     products: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         name: z.ZodString;
@@ -31142,6 +31154,7 @@ declare const storefrontSchema: z.ZodObject<{
             }[] | null | undefined;
         }[] | undefined;
     }[];
+    enabledCurrencies?: string[] | undefined;
     offers?: {
         id: string;
         discount: {
@@ -31700,6 +31713,7 @@ declare const storefrontSchema: z.ZodObject<{
             }[] | null | undefined;
         }[] | undefined;
     }[];
+    enabledCurrencies?: string[] | undefined;
     offers?: {
         id: string;
         discount: {
@@ -32075,4 +32089,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, type BundleLineItem, type CommunicationPreferences, type CompletedOrder, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, InMemoryStore, type License, LicenseStatus, type LineItem, LocalStorageStore, LogLevel, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, OfferUtils, type OpenOrder, type Order, OrderStatus, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type Quantifiable, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontProduct, type Subscription, SubscriptionStatus, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type Vendor, type Voucher, problemDetailsSchema, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, type BundleLineItem, type CommunicationPreferences, type CompletedOrder, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, InMemoryStore, type License, LicenseStatus, type LineItem, LocalStorageStore, LogLevel, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, OfferUtils, type OpenOrder, type Order, OrderStatus, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type Quantifiable, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontProduct, type Subscription, SubscriptionStatus, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type Vendor, type Voucher, objectToQuery, problemDetailsSchema, schemas, utmToObject };

package/dist/index.d.ts

@@ -59,6 +59,7 @@ interface FetchOptions {
     contentType?: string;
     abort?: AbortSignal;
 }
+declare function objectToQuery(obj?: Record<string, string | number | boolean | Date>): string;
 declare class MoonbaseApi {
     baseUrl: string;
     private tokenStore;
@@ -2084,6 +2085,8 @@ declare const subscriptionSchema: z.ZodObject<{
         };
     }>;
     cycleLength: z.ZodNativeEnum<typeof CycleLength>;
+    paymentMethod: z.ZodOptional<z.ZodString>;
+    embeddedUpdatePaymentUrl: z.ZodOptional<z.ZodString>;
     content: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"Product">;
         quantity: z.ZodNumber;
@@ -4694,6 +4697,8 @@ declare const subscriptionSchema: z.ZodObject<{
             }[] | undefined;
         };
     };
+    paymentMethod?: string | undefined;
+    embeddedUpdatePaymentUrl?: string | undefined;
 }, {
     id: string;
     status: SubscriptionStatus;
@@ -4999,6 +5004,8 @@ declare const subscriptionSchema: z.ZodObject<{
             }[] | undefined;
         };
     };
+    paymentMethod?: string | undefined;
+    embeddedUpdatePaymentUrl?: string | undefined;
 }>;
 
 declare enum SubscriptionStatus {
@@ -5013,7 +5020,10 @@ declare class SubscriptionEndpoints {
     private readonly configuration;
     constructor(api: MoonbaseApi, configuration: MoonbaseConfiguration);
     get(nextUrl?: string): Promise<Page<Subscription>>;
-    getById(subscriptionId: string): Promise<Subscription>;
+    getById(subscriptionId: string, options?: {
+        toUpdatePaymentMethod?: boolean;
+        returnUrl?: string;
+    }): Promise<Subscription>;
     cancel(subscriptionId: string): Promise<Subscription>;
     renew(subscriptionId: string, returnUrl: string, embedded: boolean): Promise<{
         location: string;
@@ -19350,6 +19360,7 @@ declare class StorefrontEndpoints {
                 }[] | null | undefined;
             }[] | undefined;
         }[];
+        enabledCurrencies?: string[] | undefined;
         offers?: {
             id: string;
             discount: {
@@ -26726,6 +26737,7 @@ declare const storefrontOfferSchema: z.ZodObject<{
 }>;
 declare const storefrontSchema: z.ZodObject<{
     suggestedCurrency: z.ZodString;
+    enabledCurrencies: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     products: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         name: z.ZodString;
@@ -31142,6 +31154,7 @@ declare const storefrontSchema: z.ZodObject<{
             }[] | null | undefined;
         }[] | undefined;
     }[];
+    enabledCurrencies?: string[] | undefined;
     offers?: {
         id: string;
         discount: {
@@ -31700,6 +31713,7 @@ declare const storefrontSchema: z.ZodObject<{
             }[] | null | undefined;
         }[] | undefined;
     }[];
+    enabledCurrencies?: string[] | undefined;
     offers?: {
         id: string;
         discount: {
@@ -32075,4 +32089,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, type BundleLineItem, type CommunicationPreferences, type CompletedOrder, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, InMemoryStore, type License, LicenseStatus, type LineItem, LocalStorageStore, LogLevel, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, OfferUtils, type OpenOrder, type Order, OrderStatus, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type Quantifiable, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontProduct, type Subscription, SubscriptionStatus, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type Vendor, type Voucher, problemDetailsSchema, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, type BundleLineItem, type CommunicationPreferences, type CompletedOrder, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, InMemoryStore, type License, LicenseStatus, type LineItem, LocalStorageStore, LogLevel, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, OfferUtils, type OpenOrder, type Order, OrderStatus, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type Quantifiable, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontProduct, type Subscription, SubscriptionStatus, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type Vendor, type Voucher, objectToQuery, problemDetailsSchema, schemas, utmToObject };

package/dist/index.js

@@ -196,6 +196,8 @@ var storefrontOfferSchema = z3.object({
 });
 var storefrontSchema = z3.object({
   suggestedCurrency: z3.string(),
+  // Enabled currencies need to be optional since we may still have old, cached representations in browsers
+  enabledCurrencies: z3.string().array().optional(),
   products: storefrontProductSchema.array(),
   bundles: storefrontBundleSchema.array(),
   // Offers need to be optional since we may still have old, cached representations in browsers
@@ -623,6 +625,132 @@ var ProductEndpoints = class {
   }
 };
 
+// src/utils/api.ts
+import fetch2 from "cross-fetch";
+function objectToQuery(obj) {
+  return Object.entries(obj != null ? obj : {}).filter(([_, value]) => value !== void 0).map(([key, value]) => `${key}=${encodeURIComponent(value instanceof Date ? value.toISOString() : value)}`).join("&");
+}
+var MoonbaseApi = class {
+  constructor(baseUrl, tokenStore, logger) {
+    this.baseUrl = baseUrl;
+    this.tokenStore = tokenStore;
+    this.logger = logger;
+  }
+  async authenticatedFetch(path, schema, options) {
+    if (!this.tokenStore.user)
+      throw new NotAuthenticatedError();
+    return await this.fetch(path, schema, options);
+  }
+  async fetch(path, schema, options) {
+    var _a;
+    const accessToken = await this.tokenStore.getAccessToken();
+    const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
+    this.logger.debug("Making request to Moonbase API...", {
+      path,
+      body: options == null ? void 0 : options.body
+    });
+    const startedAt = /* @__PURE__ */ new Date();
+    const request = {
+      method: (options == null ? void 0 : options.method) || "GET",
+      mode: "cors",
+      headers: {
+        "Accept": "application/json",
+        "Content-Type": contentType,
+        // While this fetch can be anonymous, we add the token if we have it
+        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
+        // Force CORS on all calls
+        "x-mb-cors": "1"
+      },
+      body: (options == null ? void 0 : options.body) ? contentType !== "application/json" ? options.body : JSON.stringify(options.body) : void 0,
+      signal: options == null ? void 0 : options.abort,
+      redirect: "manual"
+    };
+    const response = await fetch2(this.baseUrl + path, request);
+    const finishedAt = /* @__PURE__ */ new Date();
+    this.logger.debug("Received response from Moonbase", {
+      path,
+      status: response.status,
+      duration: finishedAt.getTime() - startedAt.getTime()
+    });
+    if (response.status >= 400) {
+      try {
+        await handleResponseProblem(response, this.logger);
+      } catch (err) {
+        this.reportRequestProblem(path, request, response, err);
+        throw err;
+      }
+    }
+    let json;
+    try {
+      json = schema ? await response.json() : null;
+      return {
+        data: schema ? schema.parse(json) : null,
+        headers: Object.fromEntries(response.headers.entries()),
+        status: response.status
+      };
+    } catch (err) {
+      this.logger.warn("Could not parse response", {
+        status: response.status,
+        path,
+        content: json || (response.bodyUsed ? "unknown" : await response.text()),
+        headers: Object.fromEntries(response.headers.entries()),
+        userAgent: window && window.navigator && window.navigator.userAgent,
+        err
+      });
+      this.reportParsingProblem(path, err, json || (response.bodyUsed ? "unknown" : await response.text()));
+      throw new MoonbaseError("Bad response", "Could not parse server response", response.status);
+    }
+  }
+  async reportParsingProblem(path, err, body) {
+    try {
+      await fetch2(`${this.baseUrl}/api/customer/insights/error`, {
+        mode: "cors",
+        method: "POST",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          title: "Parse error",
+          detail: `Could not parse response body`,
+          path,
+          origin: window == null ? void 0 : window.location.href,
+          userAgent: window && window.navigator && window.navigator.userAgent,
+          err,
+          body
+        })
+      });
+    } catch (e) {
+    }
+  }
+  async reportRequestProblem(path, request, response, err) {
+    try {
+      await fetch2(`${this.baseUrl}/api/customer/insights/warn`, {
+        mode: "cors",
+        method: "POST",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          title: "Request error",
+          detail: `Request failed with status ${response.status}`,
+          status: response.status,
+          request: {
+            ...request,
+            headers: void 0,
+            body: void 0
+          },
+          error: err,
+          path,
+          origin: window == null ? void 0 : window.location.href
+        })
+      });
+    } catch (e) {
+    }
+  }
+};
+
 // src/inventory/subscriptions/endpoints.ts
 import { z as z13 } from "zod";
 
@@ -783,6 +911,8 @@ var subscriptionSchema = z12.object({
   startedAt: z12.coerce.date(),
   total: orderTotalSchema,
   cycleLength: z12.nativeEnum(CycleLength),
+  paymentMethod: z12.string().optional(),
+  embeddedUpdatePaymentUrl: z12.string().optional(),
   content: z12.discriminatedUnion("type", [
     z12.object({
       type: z12.literal("Product"),
@@ -807,8 +937,8 @@ var SubscriptionEndpoints = class {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/inventory/subscriptions", paged(subscriptionSchema));
     return response.data;
   }
-  async getById(subscriptionId) {
-    const response = await this.api.authenticatedFetch(`/api/customer/inventory/subscriptions/${subscriptionId}`, subscriptionSchema);
+  async getById(subscriptionId, options) {
+    const response = await this.api.authenticatedFetch(`/api/customer/inventory/subscriptions/${subscriptionId}?${objectToQuery(options)}`, subscriptionSchema);
     return response.data;
   }
   async cancel(subscriptionId) {
@@ -899,129 +1029,6 @@ var StorefrontEndpoints = class {
   }
 };
 
-// src/utils/api.ts
-import fetch2 from "cross-fetch";
-var MoonbaseApi = class {
-  constructor(baseUrl, tokenStore, logger) {
-    this.baseUrl = baseUrl;
-    this.tokenStore = tokenStore;
-    this.logger = logger;
-  }
-  async authenticatedFetch(path, schema, options) {
-    if (!this.tokenStore.user)
-      throw new NotAuthenticatedError();
-    return await this.fetch(path, schema, options);
-  }
-  async fetch(path, schema, options) {
-    var _a;
-    const accessToken = await this.tokenStore.getAccessToken();
-    const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
-    this.logger.debug("Making request to Moonbase API...", {
-      path,
-      body: options == null ? void 0 : options.body
-    });
-    const startedAt = /* @__PURE__ */ new Date();
-    const request = {
-      method: (options == null ? void 0 : options.method) || "GET",
-      mode: "cors",
-      headers: {
-        "Accept": "application/json",
-        "Content-Type": contentType,
-        // While this fetch can be anonymous, we add the token if we have it
-        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
-        // Force CORS on all calls
-        "x-mb-cors": "1"
-      },
-      body: (options == null ? void 0 : options.body) ? contentType !== "application/json" ? options.body : JSON.stringify(options.body) : void 0,
-      signal: options == null ? void 0 : options.abort,
-      redirect: "manual"
-    };
-    const response = await fetch2(this.baseUrl + path, request);
-    const finishedAt = /* @__PURE__ */ new Date();
-    this.logger.debug("Received response from Moonbase", {
-      path,
-      status: response.status,
-      duration: finishedAt.getTime() - startedAt.getTime()
-    });
-    if (response.status >= 400) {
-      try {
-        await handleResponseProblem(response, this.logger);
-      } catch (err) {
-        this.reportRequestProblem(path, request, response, err);
-        throw err;
-      }
-    }
-    let json;
-    try {
-      json = schema ? await response.json() : null;
-      return {
-        data: schema ? schema.parse(json) : null,
-        headers: Object.fromEntries(response.headers.entries()),
-        status: response.status
-      };
-    } catch (err) {
-      this.logger.warn("Could not parse response", {
-        status: response.status,
-        path,
-        content: json || (response.bodyUsed ? "unknown" : await response.text()),
-        headers: Object.fromEntries(response.headers.entries()),
-        userAgent: window && window.navigator && window.navigator.userAgent,
-        err
-      });
-      this.reportParsingProblem(path, err, json || (response.bodyUsed ? "unknown" : await response.text()));
-      throw new MoonbaseError("Bad response", "Could not parse server response", response.status);
-    }
-  }
-  async reportParsingProblem(path, err, body) {
-    try {
-      await fetch2(`${this.baseUrl}/api/customer/insights/error`, {
-        mode: "cors",
-        method: "POST",
-        headers: {
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          title: "Parse error",
-          detail: `Could not parse response body`,
-          path,
-          origin: window == null ? void 0 : window.location.href,
-          userAgent: window && window.navigator && window.navigator.userAgent,
-          err,
-          body
-        })
-      });
-    } catch (e) {
-    }
-  }
-  async reportRequestProblem(path, request, response, err) {
-    try {
-      await fetch2(`${this.baseUrl}/api/customer/insights/warn`, {
-        mode: "cors",
-        method: "POST",
-        headers: {
-          "Accept": "application/json",
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          title: "Request error",
-          detail: `Request failed with status ${response.status}`,
-          status: response.status,
-          request: {
-            ...request,
-            headers: void 0,
-            body: void 0
-          },
-          error: err,
-          path,
-          origin: window == null ? void 0 : window.location.href
-        })
-      });
-    } catch (e) {
-    }
-  }
-};
-
 // src/utils/tokenStore.ts
 import fetch3 from "cross-fetch";
 
@@ -1301,10 +1308,16 @@ var OfferUtils = class {
     switch (offer.condition.type) {
       case "CartContainsItems":
         const relevantItems = order.items.filter(
-          (i) => i.type === "Product" && offer.condition.relevantItemVariations[`Product/${i.productId}`] && (offer.condition.relevantItemVariations[`Product/${i.productId}`].length === 0 || offer.condition.relevantItemVariations[`Product/${i.productId}`].includes(i.variationId)) || i.type === "Bundle" && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`] && (offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].length === 0 || offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].includes(i.variationId))
+          (i) => i.type === "Product" && offer.condition.relevantItemVariations[`Product/${i.productId}`] && offer.condition.relevantItemVariations[`Product/${i.productId}`].includes(i.variationId) || i.type === "Bundle" && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`] && offer.condition.relevantItemVariations[`Bundle/${i.bundleId}`].includes(i.variationId)
         );
-        console.log("Relevant items for offer:", { offer, relevantItems });
-        return relevantItems.length >= offer.condition.minimumItems;
+        const relevantReplacedItems = order.items.flatMap((i) => {
+          var _a;
+          return i.type === "Bundle" && offer.target.type === "Bundle" && offer.target.id === i.bundleId && offer.id === i.offerId ? (_a = i.replaced) != null ? _a : [] : [];
+        }).filter((ref) => {
+          const [productId, variationId] = ref.split("/");
+          return offer.condition.relevantItemVariations[`Product/${productId}`] && offer.condition.relevantItemVariations[`Product/${productId}`].includes(variationId);
+        });
+        return relevantItems.length + relevantReplacedItems.length >= offer.condition.minimumItems;
     }
     console.warn("Unsupported offer condition found:", offer.condition);
     return false;
@@ -1361,6 +1374,7 @@ export {
   Platform,
   SubscriptionStatus,
   TokenStore,
+  objectToQuery,
   problemDetailsSchema,
   schemas_exports3 as schemas,
   utmToObject

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/storefront-api",
   "type": "module",
-  "version": "0.4.26",
+  "version": "0.4.31",
   "description": "Package to let you build storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",