@moonbase.sh/storefront-api 0.4.25 → 0.4.27

package/dist/index.js

@@ -164,7 +164,7 @@ var storefrontProductSchema = z3.object({
   downloads: downloadSchema.array().optional(),
   defaultVariation: pricingVariationSchema.optional(),
   variations: pricingVariationSchema.array().optional(),
-  type: z3.void().transform(() => "product").pipe(z3.literal("product"))
+  type: z3.string().optional().default("Product").pipe(z3.literal("Product"))
 });
 var storefrontBundleSchema = z3.object({
   id: z3.string(),
@@ -179,12 +179,28 @@ var storefrontBundleSchema = z3.object({
   })).array(),
   defaultVariation: pricingVariationSchema.optional(),
   variations: pricingVariationSchema.array().optional(),
-  type: z3.void().transform(() => "bundle").pipe(z3.literal("bundle"))
+  type: z3.string().optional().default("Bundle").pipe(z3.literal("Bundle"))
+});
+var cartContainsItemsConditionSchema = z3.object({
+  type: z3.literal("CartContainsItems"),
+  minimumItems: z3.number(),
+  relevantItemVariations: z3.record(z3.string(), z3.string().array())
+});
+var offerConditionSchema = z3.discriminatedUnion("type", [cartContainsItemsConditionSchema]);
+var storefrontOfferSchema = z3.object({
+  id: z3.string(),
+  target: z3.union([storefrontProductSchema, storefrontBundleSchema]),
+  targetVariations: z3.string().array(),
+  condition: offerConditionSchema,
+  discount: discountSchema
 });
 var storefrontSchema = z3.object({
   suggestedCurrency: z3.string(),
+  enabledCurrencies: z3.string().array(),
   products: storefrontProductSchema.array(),
-  bundles: storefrontBundleSchema.array()
+  bundles: storefrontBundleSchema.array(),
+  // Offers need to be optional since we may still have old, cached representations in browsers
+  offers: storefrontOfferSchema.array().optional()
 });
 
 // src/activationRequests/models.ts
@@ -608,6 +624,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";
 
@@ -669,6 +811,7 @@ var openProductLineItem = z11.object({
   productId: z11.string(),
   quantity: z11.number(),
   variationId: z11.string(),
+  offerId: z11.string().optional(),
   isDefaultVariation: z11.boolean().nullish(),
   isSubcriptionPayment: z11.boolean().nullish(),
   price: priceCollectionSchema.optional(),
@@ -692,7 +835,9 @@ var openBundleLineItem = z11.object({
   bundleId: z11.string(),
   quantity: z11.number(),
   variationId: z11.string(),
+  offerId: z11.string().optional(),
   partial: z11.boolean().optional(),
+  replaced: z11.string().array().optional(),
   isDefaultVariation: z11.boolean().nullish(),
   isSubcriptionPayment: z11.boolean().nullish(),
   price: priceCollectionSchema.optional(),
@@ -765,6 +910,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"),
@@ -789,8 +936,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) {
@@ -881,129 +1028,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";
 
@@ -1252,6 +1276,55 @@ __export(schemas_exports3, {
   orders: () => schemas_exports2
 });
 
+// src/utils/discount.ts
+var DiscountUtils = class {
+  static apply(discount, price) {
+    switch (discount.type) {
+      case "PercentageOffDiscount":
+        return Object.fromEntries(Object.entries(price).map(([currency, amount]) => [currency, amount * discount.percentage]));
+      case "FlatAmountOffDiscount":
+        return Object.fromEntries(Object.entries(price).map(([currency, amount]) => {
+          var _a, _b;
+          return [currency, Math.min(amount, (_b = (_a = discount.total) == null ? void 0 : _a[currency]) != null ? _b : 0)];
+        }));
+    }
+  }
+};
+
+// src/utils/money.ts
+var MoneyCollectionUtils = class {
+  static sum(a, b) {
+    return Object.fromEntries(Object.entries(a).map(([currency, amount]) => [currency, amount + b[currency]]));
+  }
+  static subtract(a, b) {
+    return Object.fromEntries(Object.entries(a).map(([currency, amount]) => [currency, amount - b[currency]]));
+  }
+};
+
+// src/utils/offer.ts
+var OfferUtils = class {
+  static eligible(offer, order) {
+    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))
+        );
+        console.log("Relevant items for offer:", { offer, relevantItems });
+        return relevantItems.length >= offer.condition.minimumItems;
+    }
+    console.warn("Unsupported offer condition found:", offer.condition);
+    return false;
+  }
+  static applyToVariation(offer, variation) {
+    const discount = DiscountUtils.apply(offer.discount, variation.price);
+    return {
+      ...variation,
+      price: MoneyCollectionUtils.subtract(variation.price, discount),
+      hasDiscount: Object.values(discount).some((v) => v > 0) || variation.hasDiscount
+    };
+  }
+};
+
 // src/index.ts
 var MoonbaseClient = class {
   constructor(configuration) {
@@ -1277,20 +1350,24 @@ export {
   ActivationStatus,
   ConsoleLogger,
   CycleLength,
+  DiscountUtils,
   InMemoryStore,
   LicenseStatus,
   LocalStorageStore,
   LogLevel,
+  MoneyCollectionUtils,
   MoonbaseApi,
   MoonbaseClient,
   MoonbaseError,
   NotAuthenticatedError,
   NotAuthorizedError,
   NotFoundError,
+  OfferUtils,
   OrderStatus,
   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.25",
+  "version": "0.4.27",
   "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",
@@ -19,8 +19,8 @@
   "devDependencies": {
     "@types/node": "^22.5.4",
     "rimraf": "^6.0.1",
-    "tsup": "^8.2.4",
-    "typescript": "~5.5.4",
+    "tsup": "^8.5.0",
+    "typescript": "~5.8.3",
     "vitest": "^2.1.4"
   },
   "scripts": {