@reactionary/feeds 0.10.46 → 0.10.48

package/cli.cjs

@@ -112287,6 +112287,23 @@ var init_token_cache = __esm({
   }
 });
 
+// packages/commercetools/src/schema/oauth.schema.ts
+var CommercetoolsTokenIntrospectionSchema, CommercetoolsAccessTokenSchema;
+var init_oauth_schema = __esm({
+  "packages/commercetools/src/schema/oauth.schema.ts"() {
+    "use strict";
+    init_zod();
+    CommercetoolsTokenIntrospectionSchema = looseObject({
+      active: boolean2(),
+      scope: string2().optional()
+    });
+    CommercetoolsAccessTokenSchema = looseObject({
+      access_token: string2(),
+      expires_in: number2()
+    });
+  }
+});
+
 // packages/commercetools/src/core/client.ts
 var import_ts_client, import_platform_sdk, import_crypto2, crypto2, import_debug, debug, PROVIDER_SESSION_KEY, CommercetoolsAPI;
 var init_client3 = __esm({
@@ -112300,6 +112317,7 @@ var init_client3 = __esm({
     import_debug = __toESM(require_src(), 1);
     init_token_cache();
     init_session_schema2();
+    init_oauth_schema();
     debug = (0, import_debug.default)("reactionary:commercetools");
     PROVIDER_SESSION_KEY = "COMMERCETOOLS_PROVIDER";
     CommercetoolsAPI = class {
@@ -112368,7 +112386,7 @@ var init_client3 = __esm({
         const response = await client.withProjectKey({ projectKey: this.config.projectKey }).channels().withKey({ key }).get().execute();
         const channel = response.body;
         this.setSessionData({
-          cacheKey: channel.id
+          [cacheKey]: channel.id
         });
         if (debug.enabled) {
           debug(`Resolved channel ${key} from API and cached it`);
@@ -112502,7 +112520,6 @@ var init_client3 = __esm({
         };
         return identity;
       }
-      // FIXME: This can fail if the short-lived access token has expired. In other words, probably missing a token refresh.
       async introspect() {
         const session = await this.tokenCache.get();
         if (!session || !session.token) {
@@ -112511,21 +112528,13 @@ var init_client3 = __esm({
           };
           return identity;
         }
-        const authHeader = "Basic " + Buffer.from(
-          `${this.config.clientId}:${this.config.clientSecret}`
-        ).toString("base64");
-        const introspectionUrl = `${this.config.authUrl}/oauth/introspect`;
-        const response = await fetch(introspectionUrl, {
-          method: "POST",
-          headers: {
-            Authorization: authHeader,
-            "Content-Type": "application/x-www-form-urlencoded"
-          },
-          body: new URLSearchParams({
-            token: session.token
-          })
-        });
-        const body = await response.json();
+        let body = await this.introspectToken(session.token);
+        if (body && !body.active && session.refreshToken) {
+          const refreshedToken = await this.refreshAccessToken(session.refreshToken);
+          if (refreshedToken) {
+            body = await this.introspectToken(refreshedToken);
+          }
+        }
         if (!body) {
           return AnonymousIdentitySchema.parse({});
         }
@@ -112558,6 +112567,56 @@ var init_client3 = __esm({
           type: "Anonymous"
         };
       }
+      getBasicAuthHeader() {
+        return "Basic " + Buffer.from(
+          `${this.config.clientId}:${this.config.clientSecret}`
+        ).toString("base64");
+      }
+      async introspectToken(token) {
+        const response = await fetch(`${this.config.authUrl}/oauth/introspect`, {
+          method: "POST",
+          headers: {
+            Authorization: this.getBasicAuthHeader(),
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          body: new URLSearchParams({
+            token
+          })
+        });
+        const result = CommercetoolsTokenIntrospectionSchema.safeParse(await response.json());
+        return result.success ? result.data : void 0;
+      }
+      /**
+       * Exchanges the refresh token for a new access token and stores it in the token cache.
+       * Returns the new access token, or undefined if the refresh token is no longer valid.
+       */
+      async refreshAccessToken(refreshToken) {
+        const response = await fetch(`${this.config.authUrl}/oauth/token`, {
+          method: "POST",
+          headers: {
+            Authorization: this.getBasicAuthHeader(),
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          body: new URLSearchParams({
+            grant_type: "refresh_token",
+            refresh_token: refreshToken
+          })
+        });
+        if (!response.ok) {
+          return void 0;
+        }
+        const parsed = CommercetoolsAccessTokenSchema.safeParse(await response.json());
+        if (!parsed.success) {
+          return void 0;
+        }
+        const result = parsed.data;
+        await this.tokenCache.set({
+          expirationTime: Date.now() + result.expires_in * 1e3 - 5 * 60 * 1e3,
+          token: result.access_token,
+          refreshToken
+        });
+        return result.access_token;
+      }
       async becomeGuest() {
         const credentials = Buffer.from(
           `${this.config.clientId}:${this.config.clientSecret}`
@@ -113145,8 +113204,9 @@ var init_checkout_factory2 = __esm({
         if (!shippingInstruction) return false;
         if (!shippingAddress && !shippingInstruction.pickupPoint) return false;
         if (paymentInstructions.length === 0) return false;
-        const authorizedPayments = paymentInstructions.filter((paymentInstruction) => paymentInstruction.status === "authorized").map((paymentInstruction) => paymentInstruction.amount.value).reduce((sum, value) => sum + value, 0);
-        if (price.grandTotal.value !== authorizedPayments) return false;
+        const toCents = (value) => Math.round(value * 100);
+        const authorizedPayments = paymentInstructions.filter((paymentInstruction) => paymentInstruction.status === "authorized").map((paymentInstruction) => toCents(paymentInstruction.amount.value)).reduce((sum, value) => sum + value, 0);
+        if (toCents(price.grandTotal.value) !== authorizedPayments) return false;
         return true;
       }
       parsePaymentInstruction(context2, data) {
@@ -113269,11 +113329,31 @@ var init_inventory_factory2 = __esm({
   }
 });
 
+// packages/commercetools/src/core/order-status.ts
+function getOrderStatusFromOrderState(orderState) {
+  switch (orderState) {
+    case "Cancelled":
+      return "Cancelled";
+    case "Complete":
+      return "Shipped";
+    case "Confirmed":
+      return "ReleasedToFulfillment";
+    default:
+      return "AwaitingPayment";
+  }
+}
+var init_order_status = __esm({
+  "packages/commercetools/src/core/order-status.ts"() {
+    "use strict";
+  }
+});
+
 // packages/commercetools/src/factories/order/order.factory.ts
 var CommercetoolsOrderFactory;
 var init_order_factory2 = __esm({
   "packages/commercetools/src/factories/order/order.factory.ts"() {
     "use strict";
+    init_order_status();
     CommercetoolsOrderFactory = class {
       orderSchema;
       constructor(orderSchema) {
@@ -113308,7 +113388,7 @@ var init_order_factory2 = __esm({
           },
           totalShipping: {
             value: shippingTotal / 100,
-            currency: data.shippingInfo?.price.currencyCode
+            currency
           },
           totalProductPrice: {
             value: productTotal / 100,
@@ -113319,16 +113399,7 @@ var init_order_factory2 = __esm({
             currency
           }
         };
-        let orderStatus = "AwaitingPayment";
-        if (data.paymentState === "Paid" && data.orderState === "Confirmed") {
-          orderStatus = "ReleasedToFulfillment";
-        }
-        if (data.shipmentState === "Ready" && data.orderState === "Confirmed") {
-          orderStatus = "ReleasedToFulfillment";
-        }
-        if ((data.shipmentState === "Shipped" || data.shipmentState === "Delivered") && data.orderState === "Completed") {
-          orderStatus = "Shipped";
-        }
+        const orderStatus = getOrderStatusFromOrderState(data.orderState);
         const items = [];
         for (const remoteItem of data.lineItems) {
           const lineIdentifier = {
@@ -113391,6 +113462,7 @@ var CommercetoolsOrderSearchFactory;
 var init_order_search_factory2 = __esm({
   "packages/commercetools/src/factories/order-search/order-search.factory.ts"() {
     "use strict";
+    init_order_status();
     CommercetoolsOrderSearchFactory = class {
       orderSearchResultSchema;
       constructor(orderSearchResultSchema) {
@@ -113428,16 +113500,7 @@ var init_order_search_factory2 = __esm({
         const userId = {
           userId: data.customerId || data.anonymousId || ""
         };
-        let orderStatus = "AwaitingPayment";
-        if (data.paymentState === "Paid" && data.orderState === "Confirmed") {
-          orderStatus = "ReleasedToFulfillment";
-        }
-        if (data.shipmentState === "Ready" && data.orderState === "Confirmed") {
-          orderStatus = "ReleasedToFulfillment";
-        }
-        if ((data.shipmentState === "Shipped" || data.shipmentState === "Delivered") && data.orderState === "Completed") {
-          orderStatus = "Shipped";
-        }
+        const orderStatus = getOrderStatusFromOrderState(data.orderState);
         const totalAmount = {
           currency: data.totalPrice ? data.totalPrice.currencyCode : context2.languageContext.currencyCode,
           value: data.totalPrice ? data.totalPrice.centAmount / 100 : 0
@@ -113512,12 +113575,52 @@ var init_price_factory2 = __esm({
   }
 });
 
+// packages/commercetools/src/core/attribute-utils.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getAttributeValueKeyAndLabel(value, language) {
+  if (Array.isArray(value)) {
+    return getAttributeValueKeyAndLabel(value[0], language);
+  }
+  if (isRecord(value)) {
+    if ("key" in value && "label" in value) {
+      const key = String(value["key"]);
+      const label = getAttributeValueKeyAndLabel(value["label"], language).label;
+      return { key, label: label || key };
+    }
+    const localized = value[language] ?? Object.values(value).find((text4) => typeof text4 === "string");
+    const text3 = typeof localized === "string" ? localized : "";
+    return { key: text3, label: text3 };
+  }
+  const text2 = value === void 0 || value === null ? "" : String(value);
+  return { key: text2, label: text2 };
+}
+function parseVariantOptionFromAttribute(attribute, language) {
+  const option = { key: attribute.name };
+  const { key, label } = getAttributeValueKeyAndLabel(attribute.value, language);
+  return {
+    identifier: option,
+    name: attribute.name,
+    value: {
+      identifier: { option, key },
+      label
+    }
+  };
+}
+var init_attribute_utils = __esm({
+  "packages/commercetools/src/core/attribute-utils.ts"() {
+    "use strict";
+  }
+});
+
 // packages/commercetools/src/factories/product-associations/product-associations.factory.ts
 var CommercetoolsProductAssociationsFactory;
 var init_product_associations_factory2 = __esm({
   "packages/commercetools/src/factories/product-associations/product-associations.factory.ts"() {
     "use strict";
     init_src();
+    init_attribute_utils();
     init_locale_utils();
     CommercetoolsProductAssociationsFactory = class {
       productAssociationSchema;
@@ -113557,12 +113660,7 @@ var init_product_associations_factory2 = __esm({
           altText: sourceImage?.label || product.name[getLanguageCodeFromLocale(context2.languageContext.locale)] || void 0
         });
         const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
-          (option) => ProductVariantOptionSchema.parse({
-            identifier: ProductOptionIdentifierSchema.parse({
-              key: option.name
-            }),
-            name: option.value || ""
-          })
+          (option) => ProductVariantOptionSchema.parse(parseVariantOptionFromAttribute(option, getLanguageCodeFromLocale(context2.languageContext.locale)))
         ) || [];
         const mappedOption = mappedOptions?.[0];
         return ProductSearchResultItemVariantSchema.parse({
@@ -113892,6 +113990,7 @@ var init_product_search_factory3 = __esm({
   "packages/commercetools/src/factories/product-search/product-search.factory.ts"() {
     "use strict";
     init_src();
+    init_attribute_utils();
     init_locale_utils();
     CommercetoolsProductSearchFactory = class {
       productSearchResultSchema;
@@ -113982,12 +114081,7 @@ var init_product_search_factory3 = __esm({
           altText: sourceImage?.label || product.name[localeStr] || void 0
         });
         const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
-          (option) => ProductVariantOptionSchema.parse({
-            identifier: ProductOptionIdentifierSchema.parse({
-              key: option.name
-            }),
-            name: option.value || ""
-          })
+          (option) => ProductVariantOptionSchema.parse(parseVariantOptionFromAttribute(option, localeStr))
         ) || [];
         const mappedOption = mappedOptions?.[0];
         return ProductSearchResultItemVariantSchema.parse({
@@ -114295,7 +114389,7 @@ var init_cart_capability2 = __esm({
             ...lineIdentifier.originalPrice && {
               externalPrice: {
                 currencyCode: lineIdentifier.originalPrice.currency,
-                centAmount: Math.floor(lineIdentifier.originalPrice.value * 100)
+                centAmount: Math.round(lineIdentifier.originalPrice.value * 100)
               }
             }
           },
@@ -116036,7 +116130,7 @@ var init_product_list_capability2 = __esm({
     };
     __decorateClass([
       Reactionary({
-        cache: true,
+        cache: false,
         cacheTimeToLiveInSeconds: 300,
         currencyDependentCaching: false,
         localeDependentCaching: false,
@@ -116046,7 +116140,7 @@ var init_product_list_capability2 = __esm({
     ], CommercetoolsProductListCapability.prototype, "getById", 1);
     __decorateClass([
       Reactionary({
-        cache: true,
+        cache: false,
         cacheTimeToLiveInSeconds: 300,
         currencyDependentCaching: false,
         localeDependentCaching: false,
@@ -116077,7 +116171,7 @@ var init_product_list_capability2 = __esm({
     ], CommercetoolsProductListCapability.prototype, "deleteList", 1);
     __decorateClass([
       Reactionary({
-        cache: true,
+        cache: false,
         cacheTimeToLiveInSeconds: 300,
         currencyDependentCaching: false,
         localeDependentCaching: false,
@@ -116322,7 +116416,7 @@ var init_product_reviews_capability2 = __esm({
             },
             target: {
               typeId: "product",
-              id: mutation.product.key
+              key: mutation.product.key
             },
             locale: getLanguageCodeFromLocale(this.context.languageContext.locale)
           }
@@ -116333,7 +116427,7 @@ var init_product_reviews_capability2 = __esm({
       parseSingle(review, productKey) {
         return {
           identifier: {
-            key: review.key || ""
+            key: review.key ?? review.id
           },
           product: {
             key: productKey
@@ -125916,20 +126010,20 @@ function parseDamImages(raw, fallbackAltText) {
     debug17("original_dam_reference is not valid JSON: %s", trimmed);
     return [];
   }
-  if (!isRecord(parsed) || !Array.isArray(parsed["images"])) {
+  if (!isRecord2(parsed) || !Array.isArray(parsed["images"])) {
     debug17('original_dam_reference has no "images" array: %s', trimmed);
     return [];
   }
   return parsed["images"].map((entry) => parseDamImage(entry, fallbackAltText)).filter((image) => image !== null);
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function toPixelSize(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
 function parseDamImage(entry, fallbackAltText) {
-  if (!isRecord(entry)) {
+  if (!isRecord2(entry)) {
     return null;
   }
   const url2 = entry["url"];
@@ -125937,7 +126031,7 @@ function parseDamImage(entry, fallbackAltText) {
     return null;
   }
   const altText = entry["altText"];
-  const dimensions = isRecord(entry["dimensions"]) ? entry["dimensions"] : void 0;
+  const dimensions = isRecord2(entry["dimensions"]) ? entry["dimensions"] : void 0;
   return ImageSchema.parse({
     sourceUrl: url2.trim(),
     altText: typeof altText === "string" && altText.trim().length > 0 ? altText.trim() : fallbackAltText,
@@ -138469,6 +138563,22 @@ var init_checkout_capability5 = __esm({
           cart_id: payload.checkout.key
         };
       }
+      /**
+       * Whether a Medusa shipping option's calculated price is usable, i.e. has an
+       * actual amount (which may be `0` for valid free shipping) rather than no
+       * price data at all. `calculated_amount`/`original_amount` are `number | null`;
+       * checking them with a plain falsy check would incorrectly treat a `0` amount
+       * (free shipping) the same as a missing price and drop the option.
+       *
+       * Override this if a project needs different rules for which shipping
+       * options are considered usable.
+       */
+      hasUsableShippingPrice(calculatedPrice) {
+        if (!calculatedPrice) {
+          return false;
+        }
+        return calculatedPrice.calculated_amount != null || calculatedPrice.original_amount != null;
+      }
       async getAvailableShippingMethods(payload) {
         const client = await this.medusaApi.getClient();
         if (debug23.enabled) {
@@ -138503,7 +138613,7 @@ var init_checkout_capability5 = __esm({
           }
         }
         for (const sm of shippingMethodResponse.shipping_options) {
-          if (!sm.calculated_price || !sm.calculated_price.calculated_amount && !sm.calculated_price.original_amount) {
+          if (!this.hasUsableShippingPrice(sm.calculated_price)) {
             console.warn(`Skipping shipping method ${sm.name}/${sm.provider.id} because it has no calculated price for checkout ${payload.checkout.key}`);
             continue;
           }
@@ -162274,7 +162384,7 @@ var init_order_search_factory5 = __esm({
           pageNumber: (Math.ceil(data.offset / data.limit) || 0) + 1,
           pageSize: data.limit,
           totalCount: data.count,
-          totalPages: Math.ceil(data.count / data.limit || 0) + 1,
+          totalPages: Math.ceil(data.count / data.limit || 0),
           items: orders
         };
         return this.orderSearchResultSchema.parse(result);
@@ -162616,7 +162726,7 @@ var init_product_search_factory6 = __esm({
           pageNumber: (Math.ceil(remote.offset / remote.limit) || 0) + 1,
           pageSize: remote.limit,
           totalCount: remote.count,
-          totalPages: Math.ceil(remote.count / remote.limit || 0) + 1,
+          totalPages: Math.ceil(remote.count / remote.limit || 0),
           items: products,
           facets: []
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactionary/feeds",
-  "version": "0.10.46",
+  "version": "0.10.48",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
@@ -12,14 +12,14 @@
     "url": "git+https://github.com/Solteq/reactionary.git"
   },
   "dependencies": {
-    "@reactionary/algolia": "0.10.46",
-    "@reactionary/commercetools": "0.10.46",
-    "@reactionary/core": "0.10.46",
-    "@reactionary/fake": "0.10.46",
-    "@reactionary/magento": "0.10.46",
-    "@reactionary/medusa": "0.10.46",
-    "@reactionary/meilisearch": "0.10.46",
-    "@reactionary/unomi": "0.10.46",
+    "@reactionary/algolia": "0.10.48",
+    "@reactionary/commercetools": "0.10.48",
+    "@reactionary/core": "0.10.48",
+    "@reactionary/fake": "0.10.48",
+    "@reactionary/magento": "0.10.48",
+    "@reactionary/medusa": "0.10.48",
+    "@reactionary/meilisearch": "0.10.48",
+    "@reactionary/unomi": "0.10.48",
     "commander": "^15.0.0",
     "dotenv": "^17.2.2",
     "sitemap": "^9.0.1",