Refactor

Shopify · Jun 18, 2024 · acf5fc5 · acf5fc5
1 parent cb64392
commit acf5fc5
Showing 1 changed file with 9 additions and 24 deletions.
diff --git a/packages/hydrogen/src/cart/queries/cartGetDefault.ts b/packages/hydrogen/src/cart/queries/cartGetDefault.ts
@@ -1,4 +1,4 @@
-import {StorefrontApiErrors, formatAPIResult} from '../../storefront';
+import {formatAPIResult} from '../../storefront';
 import type {CustomerAccount} from '../../customer/types';
 import type {CartQueryOptions, CartReturn} from './cart-types';
 import type {
@@ -54,37 +54,22 @@ export function cartGetDefault({
 
     const [isCustomerLoggedIn, {cart, errors}] = await Promise.all([
       customerAccount ? customerAccount.isLoggedIn() : false,
-      storefront.query<{
-        cart: Cart;
-        errors: StorefrontApiErrors;
-      }>(CART_QUERY(cartFragment), {
-        variables: {
-          cartId,
-          ...cartInput,
-        },
+      storefront.query<{cart: Cart | null}>(CART_QUERY(cartFragment), {
+        variables: {cartId, ...cartInput},
         cache: storefront.CacheNone(),
       }),
     ]);
 
-    const result = formatAPIResult(
-      addCustomerLoggedInParam(isCustomerLoggedIn, cart),
-      errors,
-    );
+    if (isCustomerLoggedIn && cart?.checkoutUrl) {
+      const finalCheckoutUrl = new URL(cart.checkoutUrl);
+      finalCheckoutUrl.searchParams.set('logged_in', 'true');
+      cart.checkoutUrl = finalCheckoutUrl.toString();
+    }
 
-    return Object.keys(result).length === 0 ? null : result;
+    return cart || errors ? formatAPIResult(cart, errors) : null;
   };
 }
 
-function addCustomerLoggedInParam(isCustomerLoggedIn: boolean, cart: Cart) {
-  if (isCustomerLoggedIn && cart && cart.checkoutUrl) {
-    const finalCheckoutUrl = new URL(cart.checkoutUrl);
-    finalCheckoutUrl.searchParams.set('logged_in', 'true');
-    cart.checkoutUrl = finalCheckoutUrl.toString();
-  }
-
-  return cart;
-}
-
 //! @see https://shopify.dev/docs/api/storefront/latest/queries/cart
 const CART_QUERY = (cartFragment = DEFAULT_CART_FRAGMENT) => `#graphql
   query CartQuery(