@reactionary/medusa 0.10.49 → 0.10.51

package/capabilities/cart.capability.js

@@ -28,6 +28,7 @@ import {
   Reactionary,
   success
 } from "@reactionary/core";
+import { FetchError } from "@medusajs/js-sdk";
 import {} from "@medusajs/types";
 import createDebug from "debug";
 import {
@@ -233,6 +234,30 @@ class MedusaCartCapability extends CartCapability {
     }
     this.medusaApi.setSessionData(sessionData);
   }
+  /**
+   * Removes every trace of a cart from the session: the active cart marker
+   * (when it points at this cart) and the entry in every owned-carts
+   * collection. Used when a cart turns out to be deleted or stale upstream.
+   */
+  pruneCartFromSession(cartKey) {
+    const sessionData = this.medusaApi.getSessionData();
+    if (sessionData.activeCartId?.key === cartKey) {
+      delete sessionData.activeCartId;
+      this.medusaApi.setSessionData({ activeCartId: void 0 });
+    }
+    if (sessionData.allOwnedCarts) {
+      const prunedCollections = Object.fromEntries(
+        Object.entries(sessionData.allOwnedCarts).map(([collection, carts]) => [
+          collection,
+          carts.filter((cart) => cart.key !== cartKey)
+        ])
+      );
+      this.medusaApi.setSessionData({ allOwnedCarts: prunedCollections });
+    }
+  }
+  isNotFoundError(err) {
+    return err instanceof FetchError && err.status === 404;
+  }
   removeCartFromOwnedList(cartIdentifier, company) {
     const sessionData = this.medusaApi.getSessionData();
     const companyIdToUse = company ? company.taxIdentifier : "_me";
@@ -329,18 +354,23 @@ class MedusaCartCapability extends CartCapability {
         }
       }
       if (activeCartId) {
-        const response = await client.store.cart.retrieve(activeCartId.key, { fields: "id,region_id" });
-        if (!response.cart) {
-          delete sessionData.activeCartId;
-          this.medusaApi.setSessionData({
-            activeCartId: void 0
-          });
+        let remoteCart;
+        try {
+          const response = await client.store.cart.retrieve(activeCartId.key, { fields: "id,region_id" });
+          remoteCart = response.cart;
+        } catch (retrieveError) {
+          if (!this.isNotFoundError(retrieveError)) {
+            throw retrieveError;
+          }
+        }
+        if (!remoteCart) {
+          this.pruneCartFromSession(activeCartId.key);
           return error({
             type: "NotFound",
             identifier: activeCartId
           });
         }
-        return success(this.factory.parseCartIdentifier(this.context, response.cart));
+        return success(this.factory.parseCartIdentifier(this.context, remoteCart));
       }
       return error({
         type: "NotFound",
@@ -359,13 +389,7 @@ class MedusaCartCapability extends CartCapability {
       const client = await this.getClient();
       const medusaId = payload.cart;
       if (medusaId.key) {
-        const sessionData = this.medusaApi.getSessionData();
-        if (sessionData.activeCartId) {
-          delete sessionData.activeCartId;
-          this.medusaApi.setSessionData({
-            activeCartId: void 0
-          });
-        }
+        this.pruneCartFromSession(medusaId.key);
       }
       const cartResponse = await client.store.cart.retrieve(medusaId.key);
       if (cartResponse.cart) {
@@ -374,9 +398,11 @@ class MedusaCartCapability extends CartCapability {
         }
       }
       return success(void 0);
-    } catch (error2) {
-      debug("Failed to delete cart:", error2);
-      return success(void 0);
+    } catch (err) {
+      if (this.isNotFoundError(err)) {
+        return success(void 0);
+      }
+      handleProviderError("delete cart", err);
     }
   }
   /**

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/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.49",
+  "version": "0.10.51",
   "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.49",
+    "@reactionary/core": "0.10.51",
     "debug": "^4.4.3",
     "@medusajs/types": "^2.13.3",
     "zod": "4.1.9"

package/src/capabilities/cart.capability.d.ts

@@ -36,6 +36,13 @@ export declare class MedusaCartCapability<TFactory extends CartFactory = MedusaC
      */
     protected createCartPayload(payload: CartMutationCreateCart): Promise<StoreCreateCart>;
     protected addCartToOwnedList(cartIdentifier: MedusaCartIdentifier, companyId?: CompanyIdentifier): void;
+    /**
+     * Removes every trace of a cart from the session: the active cart marker
+     * (when it points at this cart) and the entry in every owned-carts
+     * collection. Used when a cart turns out to be deleted or stale upstream.
+     */
+    protected pruneCartFromSession(cartKey: string): void;
+    protected isNotFoundError(err: unknown): boolean;
     protected removeCartFromOwnedList(cartIdentifier: MedusaCartIdentifier, company?: CompanyIdentifier): void;
     createCart(payload: CartMutationCreateCart): Promise<Result<CartFactoryCartOutput<TFactory>>>;
     remove(payload: CartMutationItemRemove): Promise<Result<CartFactoryCartOutput<TFactory>>>;

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,