Moved auth & cart hooks + several fixes

framework/shopify/cart/utils/checkout-create.ts

@@ -11,7 +11,7 @@ export const checkoutCreate = async (fetch: any) => {
     query: checkoutCreateMutation,
   })
 
-  const checkout = data?.checkoutCreate?.checkout
+  const checkout = data.checkoutCreate?.checkout
   const checkoutId = checkout?.id
 
   if (checkoutId) {

framework/shopify/cart/utils/checkout-to-cart.ts

@@ -3,6 +3,7 @@ import { CommerceError, ValidationError } from '@commerce/utils/errors'
 
 import {
   CheckoutLineItemsAddPayload,
+  CheckoutLineItemsRemovePayload,
   CheckoutLineItemsUpdatePayload,
   Maybe,
 } from '@framework/schema'
@@ -11,9 +12,10 @@ import { normalizeCart } from '@framework/utils'
 export type CheckoutPayload =
   | CheckoutLineItemsAddPayload
   | CheckoutLineItemsUpdatePayload
+  | CheckoutLineItemsRemovePayload
 
 const checkoutToCart = (checkoutPayload?: Maybe<CheckoutPayload>): Cart => {
-  if (!checkoutPayload || !checkoutPayload?.checkout) {
+  if (!checkoutPayload) {
     throw new CommerceError({
       message: 'Invalid response from Shopify',
     })
@@ -28,6 +30,12 @@ const checkoutToCart = (checkoutPayload?: Maybe<CheckoutPayload>): Cart => {
     })
   }
 
+  if (!checkout) {
+    throw new CommerceError({
+      message: 'Invalid response from Shopify',
+    })
+  }
+
   return normalizeCart(checkout)
 }
 

framework/shopify/cart/utils/fetcher.ts

@@ -17,7 +17,7 @@ const fetcher: HookFetcherFn<Cart | null, FetchCartInput> = async ({
         checkoutId,
       },
     })
-    checkout = data?.node
+    checkout = data.node
   }
 
   if (checkout?.completedAt || !checkoutId) {

framework/shopify/cart/utils/index.ts

@@ -1,3 +1,2 @@
 export { default as checkoutToCart } from './checkout-to-cart'
 export { default as checkoutCreate } from './checkout-create'
-export { default as fetcher } from './fetcher'