@moonbase.sh/storefront-api 2.3.0 → 2.4.0

package/dist/index.js

@@ -20,6 +20,7 @@ __export(schemas_exports2, {
   offerConditionSchema: () => offerConditionSchema,
   storefrontBundleSchema: () => storefrontBundleSchema,
   storefrontOfferSchema: () => storefrontOfferSchema,
+  storefrontOfferTargetSchema: () => storefrontOfferTargetSchema,
   storefrontProductSchema: () => storefrontProductSchema,
   storefrontSchema: () => storefrontSchema,
   taxEstimateSchema: () => taxEstimateSchema
@@ -236,13 +237,36 @@ var cartContainsItemsConditionSchema = z3.object({
   relevantItemVariations: z3.record(z3.string(), z3.string().array())
 });
 var offerConditionSchema = z3.discriminatedUnion("type", [cartContainsItemsConditionSchema]);
+var offerTargetItemSchema = z3.union([storefrontProductSchema, storefrontBundleSchema]);
+var storefrontOfferTargetSchema = z3.object({
+  // The product or bundle the offer applies to.
+  item: offerTargetItemSchema,
+  // The pricing variation IDs the offer is restricted to; an empty list means all variations.
+  variations: z3.string().array()
+});
+function legacyOfferTargets(target, targetVariations) {
+  if (!target)
+    return [];
+  const items = Array.isArray(target) ? target : [target];
+  return items.map((item) => ({ item, variations: items.length === 1 ? targetVariations != null ? targetVariations : [] : [] }));
+}
 var storefrontOfferSchema = z3.object({
   id: z3.string(),
-  target: singleOrMultiple(z3.union([storefrontProductSchema, storefrontBundleSchema])),
-  targetVariations: z3.string().array(),
+  // Each target pairs a product/bundle with the pricing variations the offer applies to (an empty
+  // list means all variations). This is the model to consume.
+  targets: z3.array(storefrontOfferTargetSchema).optional(),
+  // Legacy fields, kept optional only so old cached storefront responses still parse. The API now
+  // exposes the unified `targets` model; we derive `targets` from these when a response predates it.
+  // `.catch` guards against the deprecated shape drifting: a malformed legacy field is ignored
+  // rather than failing the whole response (newer responses carry `targets` anyway).
+  target: singleOrMultiple(offerTargetItemSchema).optional().catch(void 0),
+  targetVariations: z3.string().array().optional().catch(void 0),
   condition: offerConditionSchema,
   discount: discountSchema
-});
+}).transform(({ target, targetVariations, targets, ...rest }) => ({
+  ...rest,
+  targets: targets != null ? targets : legacyOfferTargets(target, targetVariations)
+}));
 var taxEstimateSchema = z3.object({
   rate: z3.number(),
   mode: z3.enum(["Exclusive", "Inclusive"]),
@@ -464,11 +488,11 @@ async function handleResponseProblem(response, logger) {
     throw new NotAuthorizedError();
   }
   let problemDetails;
+  const body = await response.text();
   try {
-    const json = await response.json();
-    problemDetails = problemDetailsSchema.parse(json);
+    problemDetails = problemDetailsSchema.parse(JSON.parse(body));
   } catch (err) {
-    logger.warn("Could not handle response", { response, err, content: await response.text() });
+    logger.warn("Could not handle response", { response, err, content: body });
     throw new Error("An unknown problem occurred");
   }
   logger.debug("The response indicates a problem", problemDetails);
@@ -532,7 +556,8 @@ var connectionUrlSchema = z8.object({
 var userSchema = z8.object({
   id: z8.string(),
   email: z8.string(),
-  name: z8.string(),
+  // Nullable: customers created via import may have no name.
+  name: z8.string().nullable(),
   tenantId: z8.string(),
   address: addressSchema.optional(),
   phone: z8.string().optional(),
@@ -861,6 +886,9 @@ var ProductEndpoints = class {
   }
 };
 
+// src/inventory/subscriptions/endpoints.ts
+import { z as z14 } from "zod";
+
 // src/utils/api.ts
 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("&");
@@ -986,9 +1014,6 @@ var MoonbaseApi = class {
   }
 };
 
-// src/inventory/subscriptions/endpoints.ts
-import { z as z14 } from "zod";
-
 // src/inventory/subscriptions/schemas.ts
 var schemas_exports8 = {};
 __export(schemas_exports8, {
@@ -997,15 +1022,6 @@ __export(schemas_exports8, {
 });
 import { z as z13 } from "zod";
 
-// src/inventory/subscriptions/models.ts
-var SubscriptionStatus = /* @__PURE__ */ ((SubscriptionStatus2) => {
-  SubscriptionStatus2["Active"] = "Active";
-  SubscriptionStatus2["Expired"] = "Expired";
-  SubscriptionStatus2["Cancelled"] = "Cancelled";
-  SubscriptionStatus2["Completed"] = "Completed";
-  return SubscriptionStatus2;
-})(SubscriptionStatus || {});
-
 // src/orders/schemas.ts
 var schemas_exports7 = {};
 __export(schemas_exports7, {
@@ -1142,6 +1158,15 @@ var orderSchema = z12.discriminatedUnion("status", [
   completedOrderSchema
 ]);
 
+// src/inventory/subscriptions/models.ts
+var SubscriptionStatus = /* @__PURE__ */ ((SubscriptionStatus2) => {
+  SubscriptionStatus2["Active"] = "Active";
+  SubscriptionStatus2["Expired"] = "Expired";
+  SubscriptionStatus2["Cancelled"] = "Cancelled";
+  SubscriptionStatus2["Completed"] = "Completed";
+  return SubscriptionStatus2;
+})(SubscriptionStatus || {});
+
 // src/inventory/subscriptions/schemas.ts
 var baseMilestoneProgressEventSchema = z13.object({
   milestoneId: z13.string(),
@@ -1317,6 +1342,36 @@ var StorefrontEndpoints = class {
   }
 };
 
+// src/utils/logger.ts
+var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
+  LogLevel2[LogLevel2["Debug"] = 0] = "Debug";
+  LogLevel2[LogLevel2["Information"] = 1] = "Information";
+  LogLevel2[LogLevel2["Warn"] = 2] = "Warn";
+  LogLevel2[LogLevel2["Error"] = 3] = "Error";
+  return LogLevel2;
+})(LogLevel || {});
+var ConsoleLogger = class {
+  constructor(level = 2 /* Warn */) {
+    this.level = level;
+  }
+  debug(message, ...optionalParams) {
+    if (this.level <= 0 /* Debug */)
+      console.debug(message, ...optionalParams);
+  }
+  log(message, ...optionalParams) {
+    if (this.level <= 1 /* Information */)
+      console.log(message, ...optionalParams);
+  }
+  warn(message, ...optionalParams) {
+    if (this.level <= 2 /* Warn */)
+      console.warn(message, ...optionalParams);
+  }
+  error(message, ...optionalParams) {
+    if (this.level <= 3 /* Error */)
+      console.error(message, ...optionalParams);
+  }
+};
+
 // src/utils/store.ts
 var LocalStorageStore = class {
   get(key) {
@@ -1364,7 +1419,8 @@ var InMemoryStore = class {
     }
   }
   listen(key, callback) {
-    if (!this.listeners[key]) this.listeners[key] = [];
+    if (!this.listeners[key])
+      this.listeners[key] = [];
     this.listeners[key].push(callback);
   }
 };
@@ -1408,7 +1464,8 @@ var _TokenStore = class _TokenStore {
   setUser(user) {
     const identity = user;
     if (!identity.accessToken || !identity.refreshToken) {
-      if (!this.tokens) return null;
+      if (!this.tokens)
+        return null;
       this.tokens = {
         ...user,
         accessToken: this.tokens.accessToken,
@@ -1538,32 +1595,6 @@ var VoucherEndpoints = class {
   }
 };
 
-// src/utils/logger.ts
-var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
-  LogLevel2[LogLevel2["Debug"] = 0] = "Debug";
-  LogLevel2[LogLevel2["Information"] = 1] = "Information";
-  LogLevel2[LogLevel2["Warn"] = 2] = "Warn";
-  LogLevel2[LogLevel2["Error"] = 3] = "Error";
-  return LogLevel2;
-})(LogLevel || {});
-var ConsoleLogger = class {
-  constructor(level = 2 /* Warn */) {
-    this.level = level;
-  }
-  debug(message, ...optionalParams) {
-    if (this.level <= 0 /* Debug */) console.debug(message, ...optionalParams);
-  }
-  log(message, ...optionalParams) {
-    if (this.level <= 1 /* Information */) console.log(message, ...optionalParams);
-  }
-  warn(message, ...optionalParams) {
-    if (this.level <= 2 /* Warn */) console.warn(message, ...optionalParams);
-  }
-  error(message, ...optionalParams) {
-    if (this.level <= 3 /* Error */) console.error(message, ...optionalParams);
-  }
-};
-
 // src/schemas.ts
 var schemas_exports12 = {};
 __export(schemas_exports12, {
@@ -1614,7 +1645,7 @@ var MoneyCollectionUtils = class {
 var OfferUtils = class _OfferUtils {
   static eligible(offer, order) {
     switch (offer.condition.type) {
-      case "CartContainsItems":
+      case "CartContainsItems": {
         const relevantItems = order.items.filter(
           (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)
         );
@@ -1626,6 +1657,7 @@ var OfferUtils = class _OfferUtils {
           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;
@@ -1634,11 +1666,27 @@ var OfferUtils = class _OfferUtils {
   // a. Not be owned, or all targets need to be owned
   // b. Not already in the cart
   static relevantTargets(offer, cartItems) {
-    if (Array.isArray(offer.target)) {
-      const allOwned = offer.target.every((i) => i.owned);
-      return offer.target.filter((i) => (allOwned || !i.owned) && !cartItems.some((l) => l.type === i.type && i.id === (l.type === "Product" ? l.productId : l.bundleId)));
+    if (offer.targets.length > 1) {
+      const allOwned = offer.targets.every((t) => t.item.owned);
+      return offer.targets.filter((t) => (allOwned || !t.item.owned) && !cartItems.some((l) => l.type === t.item.type && t.item.id === (l.type === "Product" ? l.productId : l.bundleId)));
     }
-    return [offer.target];
+    return offer.targets;
+  }
+  // The pricing variations a target restricts the offer to. An empty (or missing) variation list
+  // means the offer is not narrowed to specific variations, in which case we keep the established
+  // single default-variation upsell.
+  static targetedVariations(target) {
+    var _a;
+    const { item, variations } = target;
+    if (variations.length === 0)
+      return item.defaultVariation ? [item.defaultVariation] : [];
+    const itemVariations = (_a = item.variations) != null ? _a : item.defaultVariation ? [item.defaultVariation] : [];
+    return itemVariations.filter((v) => variations.includes(v.id));
+  }
+  // Expands the relevant targets into one `{ target, variation }` entry per targeted variation, so
+  // an offer targeting several variations (or several products) surfaces each as its own upsell row.
+  static relevantTargetVariations(offer, cartItems) {
+    return _OfferUtils.relevantTargets(offer, cartItems).flatMap((target) => _OfferUtils.targetedVariations(target).map((variation) => ({ target: target.item, variation })));
   }
   static applyToVariation(offer, variation) {
     const discount = DiscountUtils.apply(offer.discount, variation.price);
@@ -1649,7 +1697,7 @@ var OfferUtils = class _OfferUtils {
     };
   }
   static targetContainsBundle(offer, bundleId) {
-    if (Array.isArray(offer.target)) return offer.target.some((i) => i.type === "Bundle" && i.id === bundleId);
+    return offer.targets.some((t) => t.item.type === "Bundle" && t.item.id === bundleId);
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/storefront-api",
   "type": "module",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "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",
@@ -26,6 +26,9 @@
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
     "version": "npm version",
-    "test": "vitest"
+    "type-check": "tsc --noEmit -p tsconfig.typecheck.json",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:integration": "TEST_INTEGRATION=true vitest run"
   }
 }