@thorprovider/adapters 5.0.8 → 5.0.9

package/dist/index.mjs

@@ -1057,6 +1057,12 @@ function transformCartItem(item, cartCurrencyCode) {
   const product = variant?.product;
   const currencyCode = resolveMedusaCartItemCurrencyCode(item, cartCurrencyCode);
   const totalCents = resolveMedusaCartItemTotal(item);
+  const merchandiseId = variant?.id ?? item.variant_id ?? "";
+  const merchandiseTitle = variant?.title ?? item.variant_title ?? "";
+  const productId = product?.id ?? item.product_id ?? "";
+  const productHandle = product?.handle ?? item.product_handle ?? "";
+  const productTitle = product?.title ?? item.product_title ?? "";
+  const thumbnail = product?.thumbnail ?? item.thumbnail ?? "";
   return {
     id: item.id,
     quantity: item.quantity ?? 1,
@@ -1064,17 +1070,17 @@ function transformCartItem(item, cartCurrencyCode) {
       totalAmount: transformMoney(totalCents, currencyCode)
     },
     merchandise: {
-      id: variant?.id ?? "",
-      title: variant?.title ?? "",
+      id: merchandiseId,
+      title: merchandiseTitle,
       selectedOptions: variant?.options?.map((opt) => ({
         name: opt.option?.title ?? "",
         value: opt.value ?? ""
       })) ?? [],
       product: {
-        id: product?.id ?? "",
-        handle: product?.handle ?? "",
-        title: product?.title ?? "",
-        featuredImage: product?.thumbnail ? transformImage(product.thumbnail, product.title ?? "") : transformImage("", "")
+        id: productId,
+        handle: productHandle,
+        title: productTitle,
+        featuredImage: thumbnail ? transformImage(thumbnail, productTitle) : transformImage("", "")
       }
     }
   };
@@ -2211,6 +2217,7 @@ var MedusaProvider = class {
   retryConfig;
   baseUrl;
   publishableKey;
+  regionId;
   /** Secret API key for admin operations (if configured). */
   adminApiKey;
   /**
@@ -2254,6 +2261,7 @@ var MedusaProvider = class {
     this.currencyCode = config.currencyCode ?? "USD";
     this.baseUrl = config.baseUrl;
     this.publishableKey = config.publishableKey;
+    this.regionId = config.regionId;
     this.retryConfig = {
       maxRetries: config.retry?.maxRetries ?? 3,
       timeoutMs: config.retry?.timeoutMs ?? 1e4,
@@ -2388,16 +2396,17 @@ var MedusaProvider = class {
     try {
       return await this.withRetry(
         async () => {
+          const regionId = options?.regionId ?? this.regionId;
           const baseFields = "+variants,+variants.inventory_quantity,+options,+images,+tags";
           const pricingFields = ",+variants.calculated_price,+variants.prices";
-          const fields = options?.regionId ? baseFields + pricingFields : baseFields;
+          const fields = regionId ? baseFields + pricingFields : baseFields;
           const queryParams = {
             handle,
             limit: 1,
             fields
           };
-          if (options?.regionId) {
-            queryParams.region_id = options.regionId;
+          if (regionId) {
+            queryParams.region_id = regionId;
           }
           const salesChannelId = process.env.NEXT_PUBLIC_SALES_CHANNEL_ID;
           if (salesChannelId) {
@@ -2427,9 +2436,10 @@ var MedusaProvider = class {
     try {
       return await this.withRetry(
         async () => {
+          const regionId = options.regionId ?? this.regionId;
           const baseFields = "+variants,+variants.inventory_quantity,+options,+images,+tags";
           const pricingFields = ",+variants.calculated_price,+variants.prices";
-          const fields = options.regionId ? baseFields + pricingFields : baseFields;
+          const fields = regionId ? baseFields + pricingFields : baseFields;
           const SORT_KEY_MAP = {
             featured: null,
             // server default order
@@ -2456,8 +2466,8 @@ var MedusaProvider = class {
               queryParams.order = mappedOrder;
             }
           }
-          if (options.regionId) {
-            queryParams.region_id = options.regionId;
+          if (regionId) {
+            queryParams.region_id = regionId;
           }
           if (options.categoryIds && options.categoryIds.length > 0) {
             queryParams.category_id = options.categoryIds;
@@ -2850,6 +2860,11 @@ var MedusaProvider = class {
         limit
       });
       let result = collections.map(transformCollection);
+      const salesChannelId = options?.salesChannelId ?? process.env.NEXT_PUBLIC_SALES_CHANNEL_ID;
+      const activeCollectionIds = await this._getChannelCollections(salesChannelId);
+      if (activeCollectionIds) {
+        result = result.filter((c) => activeCollectionIds.has(c.id));
+      }
       if (options?.query) {
         const q = options.query.toLowerCase();
         result = result.filter(
@@ -2866,6 +2881,89 @@ var MedusaProvider = class {
       );
     }
   }
+  /**
+   * Returns the set of product-collection IDs that have at least one product
+   * available in the given sales channel (legacy fallback).
+   *
+   * @deprecated Use `_getChannelCollections()` instead (backed by Thor Commerce plugin).
+   */
+  async _getActiveCollectionIds(salesChannelId) {
+    this.logger.debug("_getActiveCollectionIds", { salesChannelId });
+    const collectionIds = /* @__PURE__ */ new Set();
+    const limit = 500;
+    let offset = 0;
+    while (true) {
+      const { products } = await this.sdk.store.product.list({
+        sales_channel_id: [salesChannelId],
+        fields: "+collections.id",
+        limit,
+        offset
+      });
+      for (const product of products ?? []) {
+        for (const col of product.collections ?? []) {
+          if (col?.id) collectionIds.add(col.id);
+        }
+      }
+      if (!products || products.length < limit) break;
+      offset += limit;
+    }
+    this.logger.debug("_getActiveCollectionIds result", { count: collectionIds.size });
+    return collectionIds;
+  }
+  /**
+   * Fetch channel-scoped collections from Thor Commerce plugin.
+   * Uses `GET /store/thor/collections` — the endpoint resolves the sales
+   * channel from the publishable key header itself.
+   *
+   * Falls back to `_getActiveCollectionIds()` (legacy N+1) when the plugin is
+   * not available; the legacy fallback needs an explicit `salesChannelId`.
+   * Returns `null` when no scoping could be performed.
+   */
+  async _getChannelCollections(salesChannelId) {
+    try {
+      const url = `${this.baseUrl}/store/thor/collections`;
+      const response = await fetchWithRetry(
+        url,
+        {
+          method: "GET",
+          headers: {
+            "x-publishable-api-key": this.publishableKey,
+            "Content-Type": "application/json"
+          }
+        },
+        this.retryConfig
+      );
+      if (response.status === 404 || !response.ok) {
+        this.logger.debug("Thor plugin collections endpoint unavailable, falling back to legacy method");
+        return this._legacyChannelCollections(salesChannelId);
+      }
+      const data = await response.json();
+      const collectionIds = /* @__PURE__ */ new Set();
+      for (const col of data.collections ?? []) {
+        if (col?.id) collectionIds.add(col.id);
+      }
+      this.logger.debug("_getChannelCollections result (Thor plugin)", { count: collectionIds.size });
+      return collectionIds;
+    } catch (error) {
+      this.logger.warn("Failed to fetch channel collections from Thor plugin, falling back to legacy method", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return this._legacyChannelCollections(salesChannelId);
+    }
+  }
+  /**
+   * Legacy fallback for `_getChannelCollections()` when the Thor plugin is not
+   * installed. Requires an explicit `salesChannelId`; returns `null` otherwise.
+   */
+  async _legacyChannelCollections(salesChannelId) {
+    if (!salesChannelId) {
+      this.logger.warn(
+        "Cannot scope collections: Thor plugin unavailable and no sales channel id provided; returning unscoped collections"
+      );
+      return null;
+    }
+    return this._getActiveCollectionIds(salesChannelId);
+  }
   async getCollectionProducts(handle, options = {}) {
     this.logger.debug("getCollectionProducts", { handle, options });
     try {
@@ -2960,8 +3058,18 @@ var MedusaProvider = class {
   }
   /**
    * Fetch channel-scoped categories from Thor Commerce plugin.
-   * Uses `GET /store/thor/categories` — a single indexed query.
-   * Falls back to `_getActiveCategoryIds()` if the plugin is not available.
+   * Uses `GET /store/thor/categories` — a single indexed query. The endpoint
+   * resolves the sales channel from the publishable key header itself, so no
+   * explicit channel id is required when the plugin is installed.
+   *
+   * Falls back to `_getActiveCategoryIds()` (legacy N+1) when the plugin is
+   * not available. The legacy fallback needs an explicit `salesChannelId`;
+   * when none is provided and the plugin is unavailable, returns `null` to
+   * signal that scoping is not possible and the caller should skip filtering.
+   *
+   * @param salesChannelId - Only used by the legacy fallback (plugin absent).
+   * @returns Set of category IDs active in the channel, or `null` when no
+   * scoping could be performed.
    */
   async _getChannelCategories(salesChannelId) {
     try {
@@ -2977,15 +3085,9 @@ var MedusaProvider = class {
         },
         this.retryConfig
       );
-      if (response.status === 404) {
-        this.logger.debug("Thor plugin categories endpoint not found, falling back to legacy method");
-        return this._getActiveCategoryIds(salesChannelId);
-      }
-      if (!response.ok) {
-        this.logger.warn("Thor plugin categories endpoint returned non-OK status", {
-          status: response.status
-        });
-        return this._getActiveCategoryIds(salesChannelId);
+      if (response.status === 404 || !response.ok) {
+        this.logger.debug("Thor plugin categories endpoint unavailable, falling back to legacy method");
+        return this._legacyChannelCategories(salesChannelId);
       }
       const data = await response.json();
       const categoryIds = /* @__PURE__ */ new Set();
@@ -2998,8 +3100,21 @@ var MedusaProvider = class {
       this.logger.warn("Failed to fetch channel categories from Thor plugin, falling back to legacy method", {
         error: error instanceof Error ? error.message : String(error)
       });
-      return this._getActiveCategoryIds(salesChannelId);
+      return this._legacyChannelCategories(salesChannelId);
+    }
+  }
+  /**
+   * Legacy fallback for `_getChannelCategories()` when the Thor plugin is not
+   * installed. Requires an explicit `salesChannelId`; returns `null` otherwise.
+   */
+  async _legacyChannelCategories(salesChannelId) {
+    if (!salesChannelId) {
+      this.logger.warn(
+        "Cannot scope categories: Thor plugin unavailable and no sales channel id provided; returning unscoped categories"
+      );
+      return null;
     }
+    return this._getActiveCategoryIds(salesChannelId);
   }
   async getCategories(options = {}) {
     this.logger.debug("getCategories", { options });
@@ -3020,8 +3135,8 @@ var MedusaProvider = class {
       const { product_categories } = await this.sdk.store.category.list(queryParams);
       let result = product_categories.map(transformCategory);
       const salesChannelId = options.salesChannelId ?? process.env.NEXT_PUBLIC_SALES_CHANNEL_ID;
-      if (salesChannelId) {
-        const activeCategoryIds = await this._getChannelCategories(salesChannelId);
+      const activeCategoryIds = await this._getChannelCategories(salesChannelId);
+      if (activeCategoryIds) {
         result = result.filter((c) => activeCategoryIds.has(c.id));
       }
       if (options.query) {
@@ -3054,6 +3169,9 @@ var MedusaProvider = class {
         offset: options.after ? parseInt(options.after, 10) : void 0,
         fields: "+variants,+variants.prices,+variants.calculated_prices,+variants.inventory_quantity,+options,+images,+tags"
       };
+      if (this.regionId) {
+        categoryQueryParams.region_id = this.regionId;
+      }
       const salesChannelId = process.env.NEXT_PUBLIC_SALES_CHANNEL_ID;
       if (salesChannelId) {
         categoryQueryParams.sales_channel_id = [salesChannelId];
@@ -3074,7 +3192,10 @@ var MedusaProvider = class {
   // Cart Operations
   // ============================================
   async createCart(options) {
-    this.logger.debug("createCart", { regionId: options?.regionId });
+    this.logger.debug("createCart", {
+      regionId: options?.regionId,
+      salesChannelId: options?.salesChannelId
+    });
     try {
       const createPayload = {};
       if (options?.regionId) {
@@ -3082,6 +3203,10 @@ var MedusaProvider = class {
       } else {
         createPayload.currency_code = this.currencyCode.toLowerCase();
       }
+      const salesChannelId = options?.salesChannelId ?? process.env.NEXT_PUBLIC_SALES_CHANNEL_ID;
+      if (salesChannelId) {
+        createPayload.sales_channel_id = salesChannelId;
+      }
       const { cart } = await this.sdk.store.cart.create(createPayload);
       return transformCart(cart);
     } catch (error) {
@@ -3123,13 +3248,11 @@ var MedusaProvider = class {
         "retrieveCartBeforeAdd",
         retrieveCtx
       );
-      console.log("retrieveResult =", JSON.stringify(retrieveResult, null, 2));
       const backendCart = retrieveResult?.cart;
       if (!backendCart) {
         this.logger.warn("Cart not found before addToCart", { cartId });
         throw new ProviderAPIError("Cart not found. Please refresh and try again.", "medusa", 404);
       }
-      console.log("backendCart =", JSON.stringify(backendCart, null, 2));
       if (!backendCart.region_id) {
         this.logger.warn("Attempted to add item to cart with no region_id", { cartId });
         throw new ProviderAPIError(
@@ -3178,15 +3301,11 @@ var MedusaProvider = class {
               404
             );
           }
-          console.log("Found Variant:", JSON.stringify(foundVariant, null, 2));
           const variant = foundVariant;
           let hasPriceForRegion = false;
           if (variant?.calculated_price && (variant.calculated_price.calculated_amount ?? null) !== null) {
             const calcCurrency = (variant.calculated_price.currency_code || "").toLowerCase();
             const cartCurrency = (backendCart.currency_code || this.currencyCode || "").toLowerCase();
-            console.log("calcCurrency =", calcCurrency);
-            console.log("cartCurrency =", cartCurrency);
-            console.log("this.currencyCode =", this.currencyCode);
             if (!cartCurrency || calcCurrency === cartCurrency || calcCurrency === this.currencyCode.toLowerCase()) {
               hasPriceForRegion = true;
             }