@reactionary/medusa 0.10.48 → 0.10.50

package/capabilities/cart.capability.js

@@ -50,7 +50,7 @@ class MedusaCartCapability extends CartCapability {
    *
    * example: this.includedFields = [includedFields, '+discounts.*'].join(',');
    */
-  includedFields = ["+items.*"].join(",");
+  includedFields = ["+items.*", "+items.adjustments.*", "+shipping_methods.adjustments.*"].join(",");
   async listCarts(payload) {
     const client = await this.getClient();
     const sessionData = this.medusaApi.getSessionData();

package/capabilities/checkout.capability.js

@@ -22,6 +22,7 @@ import {
   CheckoutSchema,
   MonetaryAmountSchema,
   PaymentMethodSchema,
+  error,
   Reactionary,
   ShippingMethodIdentifierSchema,
   ShippingMethodSchema,
@@ -31,7 +32,7 @@ import createDebug from "debug";
 import * as z from "zod";
 import {
 } from "../schema/medusa.schema.js";
-import { handleProviderError } from "../utils/medusa-helpers.js";
+import { handleProviderError, isNotFoundFetchError } from "../utils/medusa-helpers.js";
 const debug = createDebug("reactionary:medusa:checkout");
 class CheckoutNotReadyForFinalizationError extends Error {
   constructor(checkoutIdentifier) {
@@ -88,10 +89,20 @@ class MedusaCheckoutCapability extends CheckoutCapability {
   }
   async getById(payload) {
     const client = await this.medusaApi.getClient();
-    const response = await client.store.cart.retrieve(payload.identifier.key, {
-      fields: this.includedFields
-    });
-    return success(this.factory.parseCheckout(this.context, response.cart));
+    try {
+      const response = await client.store.cart.retrieve(payload.identifier.key, {
+        fields: this.includedFields
+      });
+      return success(this.factory.parseCheckout(this.context, response.cart));
+    } catch (err) {
+      if (isNotFoundFetchError(err)) {
+        return error({
+          type: "NotFound",
+          identifier: payload.identifier
+        });
+      }
+      handleProviderError("get checkout by id", err);
+    }
   }
   setShippingAddressPayload(payload) {
     return {
@@ -240,10 +251,10 @@ class MedusaCheckoutCapability extends CheckoutCapability {
         }
       );
       return success(this.factory.parseCheckout(this.context, updatedCartResponse.cart));
-    } catch (error) {
-      debug("Failed to add payment instruction: {0}", [error]);
+    } catch (error2) {
+      debug("Failed to add payment instruction: {0}", [error2]);
       throw new Error(
-        `Failed to add payment instruction: ${error instanceof Error ? error.message : "Unknown error"}`
+        `Failed to add payment instruction: ${error2 instanceof Error ? error2.message : "Unknown error"}`
       );
     }
   }
@@ -280,13 +291,16 @@ class MedusaCheckoutCapability extends CheckoutCapability {
         return success(this.factory.parseCheckout(this.context, response.cart));
       }
       throw new Error("Failed to set shipping method");
-    } catch (error) {
-      handleProviderError("set shipping method", error);
+    } catch (error2) {
+      handleProviderError("set shipping method", error2);
     }
   }
   async finalizeCheckout(payload) {
     let checkout = await this.getById({ identifier: payload.checkout });
-    if (!checkout.success || !checkout.value.readyForFinalization) {
+    if (!checkout.success) {
+      return checkout;
+    }
+    if (!checkout.value.readyForFinalization) {
       throw new CheckoutNotReadyForFinalizationError(payload.checkout);
     }
     if (!checkout.value.resultingOrder) {

package/capabilities/order.capability.js

@@ -9,6 +9,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   return result;
 };
 import {
+  error,
   OrderCapability,
   OrderQueryByIdSchema,
   OrderSchema,
@@ -16,7 +17,7 @@ import {
   success
 } from "@reactionary/core";
 import createDebug from "debug";
-import { handleProviderError } from "../utils/medusa-helpers.js";
+import { handleProviderError, isNotFoundFetchError } from "../utils/medusa-helpers.js";
 const debug = createDebug("reactionary:medusa:order");
 class MedusaOrderCapability extends OrderCapability {
   constructor(config, cache, context, medusaApi, factory) {
@@ -36,6 +37,12 @@ class MedusaOrderCapability extends OrderCapability {
       const order = this.factory.parseOrder(this.context, response.order);
       return success(order);
     } catch (err) {
+      if (isNotFoundFetchError(err)) {
+        return error({
+          type: "NotFound",
+          identifier: payload.order
+        });
+      }
       return handleProviderError("order", err);
     }
   }

package/core/client.js

@@ -36,7 +36,7 @@ class RequestContextTokenStore {
     }
     if (debug.enabled) {
       debug(
-        `Setting token item for key: ${this.keyPrefix + "_" + key} - Value: ${value}`
+        `Setting token item for key: ${this.keyPrefix + "_" + key} - Value: <redacted, ${value.length} chars>`
       );
     }
     this.context.session[SESSION_KEY][this.keyPrefix + "_" + key] = value;

package/factories/cart/cart.factory.js

@@ -52,6 +52,7 @@ class MedusaCartFactory {
     for (const remoteItem of allItems) {
       items.push(this.parseCartItem(context, remoteItem, price.grandTotal.currency));
     }
+    const adjustmentsByPromotionId = this.groupAdjustmentsByPromotionId(data);
     const appliedPromotions = [];
     if (data.promotions) {
       for (const promo of data.promotions) {
@@ -63,11 +64,13 @@ class MedusaCartFactory {
         if (promo.application_method?.type === "fixed") {
           promoDescription = `-${promo.application_method.value} ${price.grandTotal.currency}`;
         }
+        const discountedAmount = adjustmentsByPromotionId.get(promo.id);
         appliedPromotions.push({
           code: promo.code || "",
           isCouponCode: promo.is_automatic ? false : true,
           name: promotionName || promoDescription,
-          description: promoDescription
+          description: promoDescription,
+          ...discountedAmount !== void 0 ? { amount: { value: Math.abs(discountedAmount), currency: price.grandTotal.currency } } : {}
         });
       }
     }
@@ -92,11 +95,37 @@ class MedusaCartFactory {
     return this.cartIdentifierSchema.parse(result);
   }
   /**
-  * Extension point to control the parsing of a single cart item price
-  * @param remoteItem
-  * @param currency
-  * @returns
+  * Sums each line item's and shipping method's adjustments by the promotion
+  * that caused them, so the resulting amount is the actual monetary total
+  * discounted by that promotion on this cart.
   */
+  groupAdjustmentsByPromotionId(data) {
+    const totals = /* @__PURE__ */ new Map();
+    const addAdjustments = (adjustments) => {
+      for (const adjustment of adjustments || []) {
+        if (!adjustment.promotion_id) {
+          continue;
+        }
+        totals.set(
+          adjustment.promotion_id,
+          (totals.get(adjustment.promotion_id) || 0) + adjustment.amount
+        );
+      }
+    };
+    for (const item of data.items || []) {
+      addAdjustments(item.adjustments);
+    }
+    for (const shippingMethod of data.shipping_methods || []) {
+      addAdjustments(shippingMethod.adjustments);
+    }
+    return totals;
+  }
+  /**
+   * Extension point to control the parsing of a single cart item price
+   * @param remoteItem
+   * @param currency
+   * @returns
+   */
   parseItemPrice(_context, remoteItem, currency) {
     return parseMedusaItemPrice(remoteItem, currency);
   }

package/factories/checkout/checkout.factory.js

@@ -103,16 +103,16 @@ class MedusaCheckoutFactory {
     const billingAddress = data.billing_address ? this.parseAddress(context, data.billing_address) : void 0;
     const shippingAddress = data.shipping_address ? this.parseAddress(context, data.shipping_address) : void 0;
     const backupUnattendedDelivery = data.metadata?.["consent_for_unattended_delivery"] !== void 0 ? data.metadata?.["consent_for_unattended_delivery"] === "true" : void 0;
-    const backupInstructions = data.metadata?.["instructions"] !== void 0 ? data.metadata?.["instructions"] + "" : void 0;
-    const backupPickupPoint = data.metadata?.["pickup_point"] !== void 0 ? data.metadata?.["pickup_point"] + "" : void 0;
+    const backupInstructions = data.metadata?.["instructions"] != null ? String(data.metadata["instructions"]) : void 0;
+    const backupPickupPoint = data.metadata?.["pickup_point"] != null ? String(data.metadata["pickup_point"]) : void 0;
     let shippingInstruction;
     data.shipping_methods?.forEach((sm) => {
       let pickupPoint = "";
       let instructions = "";
       let consentForUnattendedDelivery = false;
       if (sm.data) {
-        pickupPoint = sm.data["pickup_point"] + "" || "";
-        instructions = sm.data["instructions"] + "" || "";
+        pickupPoint = sm.data["pickup_point"] != null ? String(sm.data["pickup_point"]) : "";
+        instructions = sm.data["instructions"] != null ? String(sm.data["instructions"]) : "";
         consentForUnattendedDelivery = sm.data["consent_for_unattended_delivery"] === "true";
       }
       if (!pickupPoint) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactionary/medusa",
-  "version": "0.10.48",
+  "version": "0.10.50",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@medusajs/js-sdk": "^2.13.3",
-    "@reactionary/core": "0.10.48",
+    "@reactionary/core": "0.10.50",
     "debug": "^4.4.3",
     "@medusajs/types": "^2.13.3",
     "zod": "4.1.9"

package/src/factories/cart/cart.factory.d.ts

@@ -15,11 +15,17 @@ export declare class MedusaCartFactory<TCartSchema extends AnyCartSchema = typeo
     parseCart(context: RequestContext, data: StoreCart): z.output<TCartSchema>;
     parseCartIdentifier(_context: RequestContext, data: StoreCart): z.output<TCartIdentifierSchema>;
     /**
-   * Extension point to control the parsing of a single cart item price
-   * @param remoteItem
-   * @param currency
-   * @returns
+   * Sums each line item's and shipping method's adjustments by the promotion
+   * that caused them, so the resulting amount is the actual monetary total
+   * discounted by that promotion on this cart.
    */
+    protected groupAdjustmentsByPromotionId(data: StoreCart): Map<string, number>;
+    /**
+     * Extension point to control the parsing of a single cart item price
+     * @param remoteItem
+     * @param currency
+     * @returns
+     */
     protected parseItemPrice(_context: RequestContext, remoteItem: StoreCartLineItem, currency: Currency): ItemCostBreakdown;
     /**
      * Extension point to control the parsing of the cost breakdown of a cart

package/src/utils/medusa-helpers.d.ts

@@ -1,5 +1,11 @@
 import type { StoreCart } from '@medusajs/types';
 import type { CostBreakDown, Currency } from '@reactionary/core';
+/**
+ * The Medusa SDK throws a FetchError for every non-2xx response. Returns true
+ * when the error is the SDK's way of saying the resource does not exist, so
+ * capabilities can answer with a typed NotFound result instead of throwing.
+ */
+export declare function isNotFoundFetchError(error: unknown): boolean;
 /**
  * The subset of StoreCart/StoreOrder fields parseMedusaCostBreakdown reads.
  * Narrowed (rather than StoreCart | StoreOrder) so tests can build a minimal,

package/utils/medusa-helpers.js

@@ -1,5 +1,9 @@
+import { FetchError } from "@medusajs/js-sdk";
 import createDebug from "debug";
 const debug = createDebug("reactionary:medusa:helpers");
+function isNotFoundFetchError(error) {
+  return error instanceof FetchError && error.status === 404;
+}
 function parseMedusaCostBreakdown(remote) {
   const grandTotal = remote.total || 0;
   const shippingTotal = remote.shipping_total || 0;
@@ -79,6 +83,7 @@ function safeStringConvert(val, defaultValue) {
 }
 export {
   handleProviderError,
+  isNotFoundFetchError,
   parseMedusaCostBreakdown,
   parseMedusaItemPrice,
   safeBoolConvert,