@shopify/hydrogen-react 2024.10.1 → 2025.1.1

package/dist/types/useCartAPIStateMachine.d.ts

@@ -11,11 +11,11 @@ export declare function useCartAPIStateMachine({ numCartLines, onCartActionEntry
     onCartActionOptimisticUI?: (context: CartMachineContext, event: CartMachineEvent) => Partial<CartMachineContext>;
     /** A callback that is invoked after a Cart API completes. */
     onCartActionComplete?: (context: CartMachineContext, event: CartMachineFetchResultEvent) => void;
-    /** An object with fields that correspond to the Storefront API's [Cart object](https://shopify.dev/api/storefront/2024-10/objects/cart). */
+    /** An object with fields that correspond to the Storefront API's [Cart object](https://shopify.dev/api/storefront/2025-01/objects/cart). */
     data?: PartialDeep<CartType, {
         recurseIntoArrays: true;
     }>;
-    /** A fragment used to query the Storefront API's [Cart object](https://shopify.dev/api/storefront/2024-10/objects/cart) for all queries and mutations. A default value is used if no argument is provided. */
+    /** A fragment used to query the Storefront API's [Cart object](https://shopify.dev/api/storefront/2025-01/objects/cart) for all queries and mutations. A default value is used if no argument is provided. */
     cartFragment: string;
     /** The ISO country code for i18n. */
     countryCode?: CountryCode;

package/dist/types/useCartActions.d.ts

@@ -6,12 +6,12 @@ type CartResponse = PartialDeep<CartType, {
 /**
  * The `useCartActions` hook returns helper graphql functions for Storefront Cart API
  *
- * See [cart API graphql mutations](https://shopify.dev/api/storefront/2024-10/objects/Cart)
+ * See [cart API graphql mutations](https://shopify.dev/api/storefront/2025-01/objects/Cart)
  */
 export declare function useCartActions({ numCartLines, cartFragment, countryCode, languageCode, }: {
     /**  Maximum number of cart lines to fetch. Defaults to 250 cart lines. */
     numCartLines?: number;
-    /** A fragment used to query the Storefront API's [Cart object](https://shopify.dev/api/storefront/2024-10/objects/cart) for all queries and mutations. A default value is used if no argument is provided. */
+    /** A fragment used to query the Storefront API's [Cart object](https://shopify.dev/api/storefront/2025-01/objects/cart) for all queries and mutations. A default value is used if no argument is provided. */
     cartFragment: string;
     /** The ISO country code for i18n. Default to `US` */
     countryCode?: CountryCode;

package/dist/umd/hydrogen-react.dev.js

@@ -796,7 +796,7 @@
   }
 `
   );
-  const SFAPI_VERSION = "2024-10";
+  const SFAPI_VERSION = "2025-01";
   const MOCK_SHOP_DOMAIN = "mock.shop";
   const isMockShop = (domain) => domain.includes(MOCK_SHOP_DOMAIN);
   function createStorefrontClient({
@@ -2405,7 +2405,7 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
     }
     return false;
   }
-  const version = "2024.10.1";
+  const version = "2025.1.1";
   const SCHEMA_ID = "custom_storefront_customer_tracking/1.2";
   const PAGE_RENDERED_EVENT_NAME = "page_rendered";
   const COLLECTION_PAGE_RENDERED_EVENT_NAME = "collection_page_rendered";
@@ -2560,7 +2560,6 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
   function addToCart(payload) {
     const addToCartPayload = payload;
     const cartToken = parseGid(addToCartPayload.cartId);
-    const cart_token = (cartToken == null ? void 0 : cartToken.id) ? `${cartToken.id}` : null;
     return [
       schemaWrapper(
         SCHEMA_ID,
@@ -2568,7 +2567,7 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
           {
             event_name: PRODUCT_ADDED_TO_CART_EVENT_NAME,
             customerId: addToCartPayload.customerId,
-            cart_token,
+            cart_token: (cartToken == null ? void 0 : cartToken.id) ? `${cartToken.id}` : null,
             total_value: addToCartPayload.totalValue,
             products: formatProductPayload(addToCartPayload.products),
             customer_id: parseInt(
@@ -2762,13 +2761,10 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
         switch (rawType) {
           case PerformanceNavigation.TYPE_NAVIGATE:
             return "navigate";
-            break;
           case PerformanceNavigation.TYPE_RELOAD:
             return "reload";
-            break;
           case PerformanceNavigation.TYPE_BACK_FORWARD:
             return "back_forward";
-            break;
           default:
             return `unknown: ${rawType}`;
         }
@@ -3203,27 +3199,34 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
       }
       index2 = tokenizer.lastIndex;
     }
-    const lastRangeStartIndex = encodedVariantField.lastIndexOf("-");
-    if (rangeStart != null && lastRangeStartIndex > 0) {
-      const finalValueIndex = parseInt(
-        encodedVariantField.substring(lastRangeStartIndex + 1)
-      );
-      for (; rangeStart <= finalValueIndex; rangeStart++) {
-        currentOptionValue[depth] = rangeStart;
-        options.push([...currentOptionValue]);
+    const encodingEndsWithIndex = encodedVariantField.match(/\d+$/g);
+    if (encodingEndsWithIndex) {
+      const finalValueIndex = parseInt(encodingEndsWithIndex[0]);
+      if (rangeStart != null) {
+        for (; rangeStart <= finalValueIndex; rangeStart++) {
+          currentOptionValue[depth] = rangeStart;
+          options.push([...currentOptionValue]);
+        }
+      } else {
+        options.push([finalValueIndex]);
       }
     }
     return options;
   }
   function mapProductOptions(options) {
-    return options.map((option) => {
-      return Object.assign(
-        {},
-        ...(option == null ? void 0 : option.optionValues) ? option.optionValues.map((value, index2) => {
-          return { [value.name]: index2 };
-        }) : []
-      );
-    });
+    return Object.assign(
+      {},
+      ...options.map((option) => {
+        return {
+          [option.name]: Object.assign(
+            {},
+            ...(option == null ? void 0 : option.optionValues) ? option.optionValues.map((value, index2) => {
+              return { [value.name]: index2 };
+            }) : []
+          )
+        };
+      })
+    );
   }
   function mapSelectedProductOptionToObject(options) {
     return Object.assign(
@@ -3236,28 +3239,30 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
   function mapSelectedProductOptionToObjectAsString(options) {
     return JSON.stringify(mapSelectedProductOptionToObject(options));
   }
-  function encodeSelectedProductOptionAsKey(selectedOption, productOptionMappings) {
+  function encodeSelectedProductOptionAsKey(selectedOption) {
     if (Array.isArray(selectedOption)) {
       return JSON.stringify(
-        selectedOption.map((key, index2) => {
-          return productOptionMappings[index2][key.value];
-        })
+        Object.assign(
+          {},
+          ...selectedOption.map((option) => ({ [option.name]: option.value }))
+        )
       );
     } else {
-      return JSON.stringify(
-        Object.keys(selectedOption).map((key, index2) => {
-          return productOptionMappings[index2][selectedOption[key]];
-        })
-      );
+      return JSON.stringify(selectedOption);
     }
   }
-  function mapVariants(variants, productOptionMappings) {
+  function buildEncodingArrayFromSelectedOptions(selectedOption, productOptionMappings) {
+    const encoding = Object.keys(selectedOption).map((key) => {
+      return productOptionMappings[key] ? productOptionMappings[key][selectedOption[key]] : null;
+    });
+    return encoding.filter((code) => code !== null);
+  }
+  function mapVariants(variants) {
     return Object.assign(
       {},
       ...variants.map((variant) => {
         const variantKey = encodeSelectedProductOptionAsKey(
-          variant.selectedOptions || [],
-          productOptionMappings
+          variant.selectedOptions || []
         );
         return { [variantKey]: variant };
       })
@@ -3294,10 +3299,13 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
         validParam = logErrorAndReturnFalse("options.name");
       }
       if ((_a = product == null ? void 0 : product.options[0]) == null ? void 0 : _a.optionValues) {
-        const firstOptionValues = product.options[0].optionValues[0];
+        let firstOptionValues = product.options[0].optionValues[0];
         if (checkAll && !(firstOptionValues == null ? void 0 : firstOptionValues.name)) {
           validParam = logErrorAndReturnFalse("options.optionValues.name");
         }
+        firstOptionValues = product.options[0].optionValues.filter(
+          (value) => !!(value == null ? void 0 : value.firstSelectableVariant)
+        )[0];
         if (firstOptionValues == null ? void 0 : firstOptionValues.firstSelectableVariant) {
           validParam = checkProductVariantParam(
             firstOptionValues.firstSelectableVariant,
@@ -3305,10 +3313,6 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
             validParam,
             checkAll
           );
-        } else {
-          validParam = logErrorAndReturnFalse(
-            "options.optionValues.firstSelectableVariant"
-          );
         }
       } else {
         validParam = logErrorAndReturnFalse("options.optionValues");
@@ -3394,15 +3398,20 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
       encodedVariantAvailability,
       handle: productHandle
     } = checkedProduct;
+    const selectedOptionKeys = selectedVariant == null ? void 0 : selectedVariant.selectedOptions.map(
+      (option) => option.name
+    );
+    const filteredOptions = options.filter((option) => {
+      return selectedOptionKeys && selectedOptionKeys.indexOf(option.name) >= 0;
+    });
     const productOptionMappings = mapProductOptions(options);
     const variants = mapVariants(
-      selectedVariant ? [selectedVariant, ...adjacentVariants] : adjacentVariants,
-      productOptionMappings
+      selectedVariant ? [selectedVariant, ...adjacentVariants] : adjacentVariants
     );
     const selectedOptions = mapSelectedProductOptionToObject(
       selectedVariant ? selectedVariant.selectedOptions : []
     );
-    const productOptions = options.map((option, optionIndex) => {
+    const productOptions = filteredOptions.map((option, optionIndex) => {
       return {
         ...option,
         optionValues: option.optionValues.map((value) => {
@@ -3410,13 +3419,13 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
           const targetOptionParams = { ...selectedOptions };
           targetOptionParams[option.name] = value.name;
           const targetKey = encodeSelectedProductOptionAsKey(
+            targetOptionParams || []
+          );
+          const encodingKey = buildEncodingArrayFromSelectedOptions(
             targetOptionParams || [],
             productOptionMappings
           );
-          const topDownKey = JSON.parse(targetKey).slice(
-            0,
-            optionIndex + 1
-          );
+          const topDownKey = encodingKey.slice(0, optionIndex + 1);
           const exists = isOptionValueCombinationInEncodedVariant(
             topDownKey,
             encodedVariantExistence || ""
@@ -3426,11 +3435,14 @@ Refer to the authentication https://shopify.dev/api/storefront#authentication do
             encodedVariantAvailability || ""
           );
           const variant = variants[targetKey] || value.firstSelectableVariant;
-          const variantOptionParam = mapSelectedProductOptionToObject(
-            variant.selectedOptions || []
-          );
+          let variantOptionParam = {};
+          if (variant) {
+            variantOptionParam = mapSelectedProductOptionToObject(
+              variant.selectedOptions || []
+            );
+          }
           const searchParams = new URLSearchParams(variantOptionParam);
-          const handle = (_a = variant == null ? void 0 : variant.product) == null ? void 0 : _a.handle;
+          const handle = ((_a = variant == null ? void 0 : variant.product) == null ? void 0 : _a.handle) || productHandle;
           return {
             ...value,
             variant,